diff --git a/module/kanban/control.php b/module/kanban/control.php index e2f7b7c668..a7e0a02de9 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -731,8 +731,13 @@ class kanban extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $backLink)); } - $this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted'); - $this->view->lanePairs = $this->kanban->getLanePairsByGroup($groupID); + $users = $this->loadModel('user')->getPairs('noclosed|nodeleted'); + $lanePairs = $this->kanban->getLanePairsByGroup($groupID); + + $lanePairs['ditto'] = $this->lang->kanbancard->ditto; + + $this->view->users = $users; + $this->view->lanePairs = $lanePairs; $this->display(); } diff --git a/module/kanban/css/batchcreatecard.css b/module/kanban/css/batchcreatecard.css new file mode 100644 index 0000000000..0e518209d7 --- /dev/null +++ b/module/kanban/css/batchcreatecard.css @@ -0,0 +1 @@ +.c-date {width:150px;} diff --git a/module/kanban/js/batchcreatecard.js b/module/kanban/js/batchcreatecard.js new file mode 100644 index 0000000000..76e90547b8 --- /dev/null +++ b/module/kanban/js/batchcreatecard.js @@ -0,0 +1,27 @@ +$(document).on('change', "[name^='begin'], [name^='end']", function() +{ + toggleCheck($(this)); +}) +/** + * Toggle checkbox. + * + * @param object $obj + * @access public + * @return void + */ +function toggleCheck(obj) +{ + var $this = $(obj); + var date = $this.val(); + var $ditto = $this.closest('div').find("input[type='checkBox']"); + if(date == '') + { + $ditto.attr('checked', true); + $ditto.closest('.input-group-addon').show(); + } + else + { + $ditto.removeAttr('checked'); + $ditto.closest('.input-group-addon').hide(); + } +} diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 6461c73bc8..68d5efc6d1 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -328,6 +328,7 @@ $lang->kanbancard->beginAB = 'Begin'; $lang->kanbancard->to = '~'; $lang->kanbancard->archived = 'Archived'; $lang->kanbancard->empty = 'No Card'; +$lang->kanbancard->ditto = 'Ditto'; $lang->kanbancard->confirmArchive = 'Are you sure to archive this card? After archiving the card, it will be hidden from the column and you can view it in the Region - Archived.'; $lang->kanbancard->confirmDelete = 'Are you sure 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 4e33e6404e..9cd31b9ec4 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -328,6 +328,7 @@ $lang->kanbancard->beginAB = '开始'; $lang->kanbancard->to = '~'; $lang->kanbancard->archived = '已归档'; $lang->kanbancard->empty = '暂时没有卡片'; +$lang->kanbancard->ditto = '同上'; $lang->kanbancard->confirmArchive = '您确认归档该卡片吗?归档卡片后,该卡片将从列中隐藏,您可以在区域-已归档中查看。'; $lang->kanbancard->confirmDelete = '您确认删除该卡片吗?删除卡片后,该卡片将从看板中删除,您只能通过系统回收站查看。'; diff --git a/module/kanban/model.php b/module/kanban/model.php index 2a042c1969..b866c98e94 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -489,14 +489,21 @@ class kanbanModel extends model $now = helper::now(); $data = array(); $lanes = array(); + $lane = ''; + $begin = '0000-00-00'; + $end = '0000-00-00'; foreach($cards->name as $i => $name) { + $lane = ($cards->lane[$i] == 'ditto') ? $lane : $cards->lane[$i]; + $begin = (isset($cards->beginDitto[$i])) ? $begin : $cards->begin[$i]; + $end = (isset($cards->endDitto[$i])) ? $end : $cards->end[$i]; + if(empty($cards->name[$i])) continue; $data[$i] = new stdclass(); $data[$i]->name = trim($cards->name[$i]); - $data[$i]->begin = $cards->begin[$i]; - $data[$i]->end = $cards->end[$i]; + $data[$i]->begin = $begin; + $data[$i]->end = $end; $data[$i]->assignedTo = $cards->assignedTo[$i]; $data[$i]->desc = nl2br($cards->desc[$i]); $data[$i]->pri = $cards->pri[$i]; @@ -509,7 +516,7 @@ class kanbanModel extends model $data[$i]->color = '#fff'; $data[$i]->estimate = is_numeric($cards->estimate[$i]) ? (float)$cards->estimate[$i] : $cards->estimate[$i]; - $lanes[$i] = $cards->lane[$i]; + $lanes[$i] = $lane; } foreach($data as $i => $card) diff --git a/module/kanban/view/batchcreatecard.html.php b/module/kanban/view/batchcreatecard.html.php index ad3a37393a..887ffe56e1 100644 --- a/module/kanban/view/batchcreatecard.html.php +++ b/module/kanban/view/batchcreatecard.html.php @@ -27,7 +27,8 @@ kanbancard->lane;?> kanbancard->assignedTo;?> kanbancard->estimate;?> - kanbancard->beginAndEnd;?> + kanbancard->begin;?> + kanbancard->end;?> kanbancard->desc;?> kanbancard->pri;?> @@ -43,9 +44,18 @@
- kanbancard->begin}'");?> - ~ - kanbancard->end}'");?> + 0 ? "checked" : '') . " /> {$lang->kanbancard->ditto}"; + ?> +
+ + +
+ 0 ? "checked" : '') . " /> {$lang->kanbancard->ditto}"; + ?>