From 19d289455a0a422c74f27c38fbdb3f68c80be866 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Mon, 20 Jun 2022 06:34:29 +0000 Subject: [PATCH 1/6] * Finish task #57880 #57881 #57866. --- module/block/view/recentprojectblock.html.php | 7 ++++--- module/my/css/todo.css | 1 + module/productplan/model.php | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/module/block/view/recentprojectblock.html.php b/module/block/view/recentprojectblock.html.php index 169fbc845f..cfc9a0ab62 100644 --- a/module/block/view/recentprojectblock.html.php +++ b/module/block/view/recentprojectblock.html.php @@ -17,12 +17,12 @@ #cards .project-infos > span {display: inline-block; line-height: 12px;} #cards .project-infos > span > .icon {font-size: 12px; display: inline-block; position: relative; top: -1px} #cards .project-infos > span + span {margin-left: 10px;} -#cards .project-detail {position: absolute; bottom: 16px; left: 16px; right: 16px; font-size: 12px; padding-left: 10px;} +#cards .project-detail {position: absolute; bottom: 27px; left: 16px; right: 16px; font-size: 12px; padding-left: 10px;} #cards .project-detail > p {margin-bottom: 8px;} #cards .project-detail .progress {height: 4px;} #cards .project-detail .progress-text-left .progress-text {width: 50px; left: -50px;} #cards .panel-heading {cursor: pointer;} -#cards .project-stages-container {margin: 0 0 -16px 0; padding: 0 4px; height: 46px; overflow-x: auto; position: relative;} +#cards .project-stages-container {margin: 0 0 -16px 0; padding: 0 4px; height: 40px; overflow-x: auto; position: relative;} #cards .project-stages:after {content: ' '; width: 30px; display: block; right: -5px; top: 16px; bottom: -5px; z-index: 1; background: linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 100%); position: absolute;} #cards .project-stages-row {position: relative; height: 30px; z-index: 0;} #cards .project-stage-item {white-space: nowrap; position: absolute; top: 0; min-width: 48px; padding-top: 13px; color: #838A9D;} @@ -33,6 +33,7 @@ #cards .project-stage-item.is-going::before {background-color: #0C64EB;} #dashboard .block-recentproject .panel-body {padding: 0;} .execution-name {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.scrollbar::-webkit-scrollbar:horizontal {height: 5px;}
@@ -83,7 +84,7 @@
project->statusList, $project->status);?>

project->ongoingStage;?>

-
+
'> diff --git a/module/my/css/todo.css b/module/my/css/todo.css index 8f95c20890..16e7df2064 100644 --- a/module/my/css/todo.css +++ b/module/my/css/todo.css @@ -2,3 +2,4 @@ .datepicker-wrapper .form-control {max-width: 110px; line-height: 25px; height: 26px !important;} .btn-group button.dropdown-toggle.btn-primary {padding: 6px;} .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);} +.btn-toolbar .space {min-height: 1px; margin: 0 -3px 0 10px;} diff --git a/module/productplan/model.php b/module/productplan/model.php index be0161beef..5d5c6be09f 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -216,6 +216,7 @@ class productplanModel extends model ->beginIF($branch !== '')->andWhere('branch')->eq($branch)->fi() ->andWhere('parent')->le(0) ->andWhere('deleted')->eq(0) + ->orderBy('id_desc') ->fetchPairs(); if($exclude) unset($planPairs[$exclude]); From 32c34c35e9222420291b7751bf02d098a6ba7412 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Mon, 20 Jun 2022 07:43:08 +0000 Subject: [PATCH 2/6] * Finish task #57880 #57881 #57866. --- module/my/view/todo.html.php | 2 +- module/productplan/model.php | 3 +++ module/todo/lang/en.php | 1 + module/todo/lang/zh-cn.php | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 0c22db5a05..149aa3afbc 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -174,7 +174,7 @@ echo ''; echo ''; echo '
'; - echo html::commonButton($lang->todo->import, "onclick=\"setFormAction('$actionLink')\""); + echo html::commonButton($lang->todo->changeDate, "onclick=\"setFormAction('$actionLink')\""); } ?>
diff --git a/module/productplan/model.php b/module/productplan/model.php index 5d5c6be09f..f870edc308 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -1,4 +1,5 @@ dao->select("id,title")->from(TABLE_PRODUCTPLAN) ->where('product')->eq($productID) ->beginIF($branch !== '')->andWhere('branch')->eq($branch)->fi() ->andWhere('parent')->le(0) + ->andWhere('status')->notin($statusList) ->andWhere('deleted')->eq(0) ->orderBy('id_desc') ->fetchPairs(); diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index 202b62452d..3081828d39 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -36,6 +36,7 @@ $lang->todo->cycleConfig = "Recurrence"; $lang->todo->project = "Project"; $lang->todo->product = "Product"; $lang->todo->execution = $lang->executionCommon; +$lang->todo->changeDate = "Change Date"; $lang->todo->reasonList['story'] = "Convert to Story"; $lang->todo->reasonList['task'] = "Convert to Task"; diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index e5e11b9b0d..cdd35d4f28 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -36,6 +36,7 @@ $lang->todo->cycleConfig = "周期设置"; $lang->todo->project = "所属项目"; $lang->todo->product = "所属产品"; $lang->todo->execution = "所属{$lang->execution->common}"; +$lang->todo->changeDate = "修改日期"; $lang->todo->reasonList['story'] = "转{$lang->SRCommon}"; $lang->todo->reasonList['task'] = "转任务"; From e2d00ec066d17e738d110963f95f8c89ee8c4df6 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Mon, 20 Jun 2022 08:11:52 +0000 Subject: [PATCH 3/6] * Finish task #57880 #57881 #57866. --- module/my/css/todo.css | 1 + module/my/view/todo.html.php | 2 +- module/productplan/model.php | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/my/css/todo.css b/module/my/css/todo.css index 16e7df2064..4391484b57 100644 --- a/module/my/css/todo.css +++ b/module/my/css/todo.css @@ -3,3 +3,4 @@ .btn-group button.dropdown-toggle.btn-primary {padding: 6px;} .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);} .btn-toolbar .space {min-height: 1px; margin: 0 -3px 0 10px;} +.iconCenter {top: -2px !important;} diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 149aa3afbc..6db91d204f 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -172,7 +172,7 @@ $actionLink = $this->createLink('todo', 'import2Today'); echo "
"; echo ''; - echo ''; + echo ''; echo '
'; echo html::commonButton($lang->todo->changeDate, "onclick=\"setFormAction('$actionLink')\""); } diff --git a/module/productplan/model.php b/module/productplan/model.php index f870edc308..347376abd7 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -1,5 +1,4 @@ Date: Mon, 20 Jun 2022 08:17:44 +0000 Subject: [PATCH 4/6] * Finish task #57871. --- module/productplan/model.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/module/productplan/model.php b/module/productplan/model.php index 347376abd7..b0d2e76a44 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -211,12 +211,11 @@ class productplanModel extends model */ public function getTopPlanPairs($productID, $branch = '', $exclude = '') { - $statusList = array('done','closed'); $planPairs = $this->dao->select("id,title")->from(TABLE_PRODUCTPLAN) ->where('product')->eq($productID) ->beginIF($branch !== '')->andWhere('branch')->eq($branch)->fi() ->andWhere('parent')->le(0) - ->andWhere('status')->notin($statusList) + ->andWhere('status')->notin('done,closed') ->andWhere('deleted')->eq(0) ->orderBy('id_desc') ->fetchPairs(); From f8792b01bff0ca924f861a559af640429e063b58 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Tue, 21 Jun 2022 00:42:05 +0000 Subject: [PATCH 5/6] * Finish task #57871. --- module/productplan/model.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/productplan/model.php b/module/productplan/model.php index b0d2e76a44..5d5c6be09f 100644 --- a/module/productplan/model.php +++ b/module/productplan/model.php @@ -215,7 +215,6 @@ class productplanModel extends model ->where('product')->eq($productID) ->beginIF($branch !== '')->andWhere('branch')->eq($branch)->fi() ->andWhere('parent')->le(0) - ->andWhere('status')->notin('done,closed') ->andWhere('deleted')->eq(0) ->orderBy('id_desc') ->fetchPairs(); From e3ae6ed6a0fc375277c1c241fdd40e5086721846 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Tue, 21 Jun 2022 01:31:23 +0000 Subject: [PATCH 6/6] * Finish task #57871. --- extension/lite/effort/ext/view/calendar.html.php | 7 +++++-- extension/lite/todo/ext/view/calendar.html.php | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/extension/lite/effort/ext/view/calendar.html.php b/extension/lite/effort/ext/view/calendar.html.php index cbe294010a..4a8f0456a6 100644 --- a/extension/lite/effort/ext/view/calendar.html.php +++ b/extension/lite/effort/ext/view/calendar.html.php @@ -13,6 +13,9 @@ getModuleRoot() . 'common/view/header.html.php';?> getModuleRoot() . 'common/view/datepicker.html.php';?> getExtensionRoot() . 'biz/common/ext/view/calendar.html.php';?> +