From 0e5b54464c3fd0218ef2b59d090d2ed901767830 Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Fri, 17 Dec 2021 13:18:10 +0800 Subject: [PATCH 1/2] *Finish task. --- module/kanban/css/view.css | 4 ++-- module/kanban/js/view.js | 34 +++++++++++++++++++++++++--------- module/kanban/lang/en.php | 2 ++ module/kanban/lang/zh-cn.php | 2 ++ module/kanban/model.php | 2 +- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index c033898342..6db1763086 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -9,7 +9,7 @@ body {background-color: #fff} .has-error .form-control:focus {box-shadow: inset 0 1px 1px rgb(0 0 0 / 8%), 0 0 6px #f5b2a5!important;} .has-error .form-control::placeholder {color: #ff4268!important;} -.label.text-red {color: #ff4268;} +.label.text-red {background: #ff4268 !important; color: #ffffff;} .dropdown-menu > li {padding: 0 10px;} .dropdown-menu > li > a > .icon {position: relative; left: -5px;} @@ -20,7 +20,7 @@ body {background-color: #fff} .region .region-header label {color: #999; background: transparent; border: 1px solid #ddd; margin-left: 10px; margin-right: 10px} .region .region-header .action {float: right} .region .region-header .icon-double-angle-up,.icon-double-angle-down {cursor: pointer;} -.region.sort .region-header {cursor: move;} +.region .sort .region-header {cursor: move;} .region .kanban {padding: 0px 10px 10px 10px; min-height: unset;} .region .kanban .form-actions {margin: 0;} diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index bb8f5232a0..664d89232d 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -279,19 +279,35 @@ function renderKanbanItem(item, $item) .text(item.pri); var $time = $info.children('.time'); - if(item.end && item.end !== '0000-00-00') + if(item.end == '0000-00-00' && item.begin == '0000-00-00') { - var end = $.zui.createDate(item.end); - var today = new Date(); - var isExpired = end.getTime() < today.getTime(); - var dateFormat = (today.getFullYear() === end.getFullYear() ? 'MM-dd ' : 'yyyy-MM-dd ') + kanbancardLang.deadlineAB; - $time.text($.zui.formatDate(end, dateFormat)) - .toggleClass('text-red', isExpired) - .show(); + $time.hide(); } else { - $time.hide(); + var today = new Date(); + var begin = $.zui.createDate(item.begin); + var end = $.zui.createDate(item.end); + var needRemind = (begin.toLocaleDateString() == today.toLocaleDateString() || end.toLocaleDateString() == today.toLocaleDateString()); + var isCureentYear = today.getFullYear() == begin.getFullYear(); + if(item.end == '0000-00-00' && item.begin != '0000-00-00') + { + var dateFormat = (isCureentYear ? 'MM-dd ' : 'yyyy-MM-dd ') + kanbancardLang.beginAB; + $time.text($.zui.formatDate(begin, dateFormat)).show(); + } + else if(item.begin == '0000-00-00' && item.end != '0000-00-00') + { + var dateFormat = (isCureentYear ? 'MM-dd ' : 'yyyy-MM-dd ') + kanbancardLang.deadlineAB; + $time.text($.zui.formatDate(end, dateFormat)).show(); + } + else if(item.begin != '0000-00-00' && item.end != '0000-00-00') + { + var beginDateFormat = (isCureentYear ? 'MM-dd ' : 'yyyy-MM-dd ') + kanbancardLang.to + ' '; + var endDateFormat = isCureentYear ? 'MM-dd ' : 'yyyy-MM-dd '; + $time.text($.zui.formatDate(begin, beginDateFormat) + $.zui.formatDate(end, endDateFormat)).show(); + } + + $time.toggleClass('text-red', needRemind); } /* Display avatars of assignedTo. */ diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 84ef5f7c48..1f4222e243 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -266,6 +266,8 @@ $lang->kanbancard->archivedDate = 'Archived Date'; $lang->kanbancard->lblHour = 'h'; $lang->kanbancard->noAssigned = 'No Assigned'; $lang->kanbancard->deadlineAB = 'DL'; +$lang->kanbancard->beginAB = 'Begin'; +$lang->kanbancard->to = 'to'; $lang->kanbancard->confirmDelete = 'Do you want to delete this card? After deleting the card, it will be deleted from the Kanban. You can only view it in the system recycle bin.'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 01b63bd466..6bbb68acbd 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -266,6 +266,8 @@ $lang->kanbancard->archivedDate = '归档时间'; $lang->kanbancard->lblHour = 'h'; $lang->kanbancard->noAssigned = '未指派'; $lang->kanbancard->deadlineAB = '截止'; +$lang->kanbancard->beginAB = '开始'; +$lang->kanbancard->to = '至'; $lang->kanbancard->confirmDelete = '您确认删除该卡片吗？删除卡片后，该卡片将从看板中删除，您只能通过系统回收站查看。'; diff --git a/module/kanban/model.php b/module/kanban/model.php index 68801de276..fc7c13a6d4 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1647,7 +1647,7 @@ class kanbanModel extends model return false; } - if($this->post->begin > $this->post->end) + if($this->post->end && $this->post->begin > $this->post->end) { dao::$errors[] = $this->lang->kanbancard->error->endSmall; return false; From 80cd2e52fdc0fb289ec5d17bc4f79747f97e398c Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Fri, 17 Dec 2021 13:23:09 +0800 Subject: [PATCH 2/2] *Fix . --- module/kanban/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/kanban/model.php b/module/kanban/model.php index fc7c13a6d4..74089e90fd 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1647,7 +1647,7 @@ class kanbanModel extends model return false; } - if($this->post->end && $this->post->begin > $this->post->end) + if($this->post->end && ($this->post->begin > $this->post->end)) { dao::$errors[] = $this->lang->kanbancard->error->endSmall; return false;