From e4e040326b511ab26aa3273387913051e7a664fc Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 26 Nov 2021 14:01:11 +0800 Subject: [PATCH 1/3] * Finish task #45156. --- module/company/control.php | 5 +++-- module/company/css/dynamic.css | 3 ++- module/company/js/dynamic.js | 5 +++-- module/company/lang/en.php | 3 +++ module/company/lang/zh-cn.php | 3 +++ module/company/view/dynamic.html.php | 4 ++-- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/module/company/control.php b/module/company/control.php index be57833a37..111beca380 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -170,7 +170,7 @@ class company extends control * @access public * @return void */ - public function dynamic($browseType = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next', $userID = '', $productID = 0, $projectID = 0, $executionID = 0) + public function dynamic($browseType = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next', $userID = '', $productID = 0, $projectID = 0, $executionID = 0, $orderBy = 'date_desc') { $this->company->setMenu(); $this->app->loadLang('user'); @@ -203,7 +203,6 @@ class company extends control $pager = new pager($recTotal, $recPerPage = 50, $pageID = 1); /* Append id for secend sort. */ - $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc'; $sort = $this->loadModel('common')->appendOrder($orderBy); $queryID = ($browseType == 'bysearch') ? (int)$param : 0; @@ -244,10 +243,12 @@ class company extends control if(!$productID) $productID = 'all'; if(!$projectID) $projectID = 'all'; if(!$executionID) $executionID = 'all'; + $actions = $this->action->getDynamic($account, $browseType, $sort, $pager, $productID, $projectID, $executionID, $date, $direction); } else { + $actions = $this->action->getDynamicBySearch($products, $projects, $executions, $queryID, $sort, $pager, $date, $direction); } diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css index a26a494018..92562b88b3 100644 --- a/module/company/css/dynamic.css +++ b/module/company/css/dynamic.css @@ -18,5 +18,6 @@ .dynamic.collapsed .timeline > li + li {display: none;} .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';} -.c-user, .c-project, .c-product, .c-execution {width: 150px !important; overflow: unset;} +.c-project, .c-product, .c-execution {width: 150px !important; overflow: unset;} +.c-user,.c-order {width: 100px !important; overflow: unset;} .c-date {width: 200px;} diff --git a/module/company/js/dynamic.js b/module/company/js/dynamic.js index d03c9031c6..1e6de4d1fa 100644 --- a/module/company/js/dynamic.js +++ b/module/company/js/dynamic.js @@ -1,11 +1,12 @@ -$('#account, #product, #project, #execution').change(function() +$('#account, #product, #project, #execution, #orderBy').change(function() { var userID = $('#account').val(); var productID = $('#product').val(); var projectID = systemMode == 'new' ? $('#project').val() : 0; var executionID = $('#execution').val(); + var orderBy = $('#orderBy').val(); browseType = browseType == 'bysearch' ? 'all' : browseType; - link = createLink('company', 'dynamic', 'browseType=' + browseType + '¶m=&recTotal=0&date=&direction=next&userID=' + userID + '&productID=' + productID + '&projectID=' + projectID + '&executionID=' + executionID); + link = createLink('company', 'dynamic', 'browseType=' + browseType + '¶m=&recTotal=0&date=&direction=next&userID=' + userID + '&productID=' + productID + '&projectID=' + projectID + '&executionID=' + executionID + '&orderBy=' + orderBy); location.href = link; }) diff --git a/module/company/lang/en.php b/module/company/lang/en.php index 893dd3ff15..5a3b707db8 100644 --- a/module/company/lang/en.php +++ b/module/company/lang/en.php @@ -37,3 +37,6 @@ $lang->company->user = 'User'; $lang->company->guestOptions[0] = 'Deny'; $lang->company->guestOptions[1] = 'Allow'; + +$lang->company->order['date_desc'] = 'Descending'; +$lang->company->order['date_asc'] = 'Ascending'; diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php index 796c839ba4..61147a7092 100644 --- a/module/company/lang/zh-cn.php +++ b/module/company/lang/zh-cn.php @@ -37,3 +37,6 @@ $lang->company->user = '用户'; $lang->company->guestOptions[0] = '不允许'; $lang->company->guestOptions[1] = '允许'; + +$lang->company->order['date_desc'] = '倒序排列'; +$lang->company->order['date_asc'] = '正序排列'; diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index 6e2a4f9711..3c5bc77f7e 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -24,7 +24,7 @@ $active = 'btn-active-text'; $label .= " {$pager->recTotal}"; } - echo html::a(inlink('dynamic', "browseType=$period¶m=&recTotal=0&date=&direction=next&userID=$userID&productID=$productID&projectID=$projectID&executionID=$executionID"), $label, '', "class='btn btn-link $active' id='{$period}'") + echo html::a(inlink('dynamic', "browseType=$period¶m=&recTotal=0&date=&direction=next&userID=$userID&productID=$productID&projectID=$projectID&executionID=$executionID&orderBy=$orderBy"), $label, '', "class='btn btn-link $active' id='{$period}'") ?>
@@ -33,6 +33,7 @@
+
company->order, $orderBy, 'class="form-control chosen" data-max_drop_width="215"'); ?>
action->dynamic->search;?> @@ -52,7 +53,6 @@