Merge branch 'sprint/179_zhengrunyu_' into 'kanban'

*Finish task.

See merge request easycorp/zentaopms!982

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;}

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. */

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.';
 

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 = '您确认删除该卡片吗？删除卡片后，该卡片将从看板中删除，您只能通过系统回收站查看。';
 

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;