diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 8bad6a2826..258c311888 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -238,7 +238,7 @@ function renderKanbanItem(item, $item) var end = $.zui.createDate(item.end); var today = $.zui.createDate(today); var isExpired = end.getTime() < today.getTime(); - var dateFormat = (today.getFullYear() === end.getFullYear() ? 'MM-dd ' : 'yyyy-MM-dd ') + kanbancardLang.end; + var dateFormat = (today.getFullYear() === end.getFullYear() ? 'MM-dd ' : 'yyyy-MM-dd ') + kanbancardLang.deadlineAB; $time.text($.zui.formatDate(end, dateFormat)) .toggleClass('text-red', isExpired) .show(); diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 8a085bf61a..a618179261 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -244,6 +244,7 @@ $lang->kanbancard->lastEditedBy = 'Last Edited By'; $lang->kanbancard->lastEditedDate = 'Last Edited Date'; $lang->kanbancard->lblHour = 'h'; $lang->kanbancard->noAssigned = 'No Assigned'; +$lang->kanbancard->deadlineAB = 'DL'; $lang->kanbancard->priList[1] = 1; $lang->kanbancard->priList[2] = 2; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 58e816e2ba..c066859c1e 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -248,6 +248,7 @@ $lang->kanbancard->archivedBy = '由谁归档'; $lang->kanbancard->archivedDate = '归档时间'; $lang->kanbancard->lblHour = 'h'; $lang->kanbancard->noAssigned = '未指派'; +$lang->kanbancard->deadlineAB = '截止'; $lang->kanbancard->priList[1] = 1; $lang->kanbancard->priList[2] = 2; diff --git a/module/kanban/model.php b/module/kanban/model.php index 41a1deff07..f8ac03392e 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -316,6 +316,7 @@ class kanbanModel extends model ->add('createdDate', $now) ->add('assignedDate', $now) ->setDefault('estimate', 0) + ->join('assignedTo', ',') ->setIF(is_numeric($this->post->estimate), 'estimate', (float)$this->post->estimate) ->remove('uid') ->get(); diff --git a/module/kanban/view/createcard.html.php b/module/kanban/view/createcard.html.php index fe5697ef80..12969bb369 100644 --- a/module/kanban/view/createcard.html.php +++ b/module/kanban/view/createcard.html.php @@ -19,37 +19,11 @@
- - - - - - - - - - - - + + + + + + + + diff --git a/module/kanban/view/createcolumn.html.php b/module/kanban/view/createcolumn.html.php index fa220caa6d..dafe2cc1e7 100644 --- a/module/kanban/view/createcolumn.html.php +++ b/module/kanban/view/createcolumn.html.php @@ -43,11 +43,13 @@ - +
kanbancard->estimate;?> -
- - kanbancard->lblHour;?> -
-
kanbancard->assignedTo;?> - user->account, "class='form-control chosen'");?> -
kanbancard->beginAndEnd;?> -
- kanbancard->begin}'");?> - ~ - kanbancard->end}'");?> -
-
kanbancard->name;?> -
- + kanbancard->pri;?>
+
+
+ kanbancard->estimate;?> + kanbancard->lblHour;?>> +
+
+ +
kanbancard->assignedTo;?> + user->account, "class='form-control chosen' multiple");?> +
kanbancard->beginAndEnd;?> +
+ kanbancard->begin}'");?> + ~ + kanbancard->end}'");?>
kanbancolumn->color;?>
+
+ +
- group);?> parent);?>