From 1801b1e783b273ad1f83d8d760c2f0365468b122 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Tue, 25 Jan 2022 09:10:26 +0800 Subject: [PATCH] * Add pending future to the product plan. --- module/kanban/css/view.css | 1 + module/kanban/js/view.js | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index 5efe68a76a..81b5c22cc8 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -109,6 +109,7 @@ .label-wait {background: #EFEFEF !important; color: #838A9D;} .label-doing {background: #f8d2d2 !important; color: #e64b4c;} .label-suspended {background: #fff3d9 !important; color: #ff9800;} +.label-future {background: #EFEFEF !important; color: #838A9D; border-radius: 9px} .label-closed, .label-terminate {background: #e5e5e5 !important; color: #b8b8b8;} .label-deleted {background: #ff5d5d !important; color: #fff;} .label-normal {background: #e1e8d9 !important; color: #9abe76;} diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 3769819126..dd04421bbb 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -578,15 +578,21 @@ function renderProductplanItem(item, $item) } } - /* Display product plan date. */ - var $date = $info.children('.date'); - var productplanDate = $.zui.createDate(item.date); - var today = new Date(); - var labelType = productplanDate.toLocaleDateString() == today.toLocaleDateString() ? 'light' : 'wait'; - if(!$date.length) $date = $('').appendTo($info); + /* Display deadline of product plan. */ + var $date = $info.children('.date'); + var begin = $.zui.createDate(item.begin); + var end = $.zui.createDate(item.end); + var today = new Date(); + var labelType = 'wait'; + var labelTitle = $.zui.formatDate(begin, 'MM-dd') + ' ' + productplanLang.to + ' ' + $.zui.formatDate(end, 'MM-dd'); - $date.text($.zui.formatDate(productplanDate, 'yyyy-MM-dd')).attr('title', $.zui.formatDate(productplanDate, 'yyyy-MM-dd')).show(); - if(labelType == 'light') $date.css('background-color', 'rgba(210, 50, 61, 0.3)'); + if((item.begin == '2030-01-01' || item.end == '2030-01-01')) + { + labelType = 'future'; + labelTitle = productplanLang.future; + } + if(!$date.length) $date = $('').appendTo($info); + $date.text(labelTitle).attr('title', labelTitle).show(); /* Display avatars of creator. */ var $user = $info.children('.user');