* Fix create card view.

This commit is contained in:
孙广明
2021-12-14 16:22:24 +08:00
parent da93f52918
commit 6ea815f13e
6 changed files with 31 additions and 30 deletions
+1 -1
View File
@@ -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();
+1
View File
@@ -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;
+1
View File
@@ -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;
+1
View File
@@ -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();
+23 -27
View File
@@ -19,37 +19,11 @@
</div>
<form class='main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->kanbancard->estimate;?></th>
<td>
<div class="input-group">
<input type="text" name="estimate" id="estimate" value="" class="form-control" autocomplete="off">
<span class="input-group-addon"><?php echo $lang->kanbancard->lblHour;?></span>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->kanbancard->assignedTo;?></th>
<td>
<?php echo html::select('assignedTo', $users, $app->user->account, "class='form-control chosen'");?>
</td>
</tr>
<tr>
<th><?php echo $lang->kanbancard->beginAndEnd;?></th>
<td colspan='2'>
<div class='input-group'>
<?php echo html::input('begin', '', "class='form-control form-date' placeholder='{$lang->kanbancard->begin}'");?>
<span class='input-group-addon fix-border'>~</span>
<?php echo html::input('end', '', "class='form-control form-date' placeholder='{$lang->kanbancard->end}'");?>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->kanbancard->name;?></th>
<td colspan='2'>
<div class='required required-wrapper'></div>
<div class='input-group title-group'>
<?php echo html::input('name', '', "class='form-control'");?>
<?php echo html::input('name', '', "class='form-control required'");?>
<span class="input-group-addon fix-border br-0"><?php echo $lang->kanbancard->pri;?></span>
<div class="input-group-btn pri-selector" data-type="pri">
<button type="button" class="btn dropdown-toggle br-0" data-toggle="dropdown">
@@ -59,6 +33,28 @@
<?php echo html::select('pri', $lang->kanbancard->priList, 3, "class='form-control' data-provide='labelSelector' data-label-class='label-pri'");?>
</div>
</div>
<div class='table-col w-120px'>
<div class="input-group">
<span class="input-group-addon fix-border br-0"><?php echo $lang->kanbancard->estimate;?></span>
<input type="text" name="estimate" id="estimate" class="form-control" autocomplete="off" placeholder=<?php echo $lang->kanbancard->lblHour;?>>
</div>
</div>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->kanbancard->assignedTo;?></th>
<td colspan='2'>
<?php echo html::select('assignedTo', $users, $app->user->account, "class='form-control chosen' multiple");?>
</td>
</tr>
<tr>
<th><?php echo $lang->kanbancard->beginAndEnd;?></th>
<td colspan='2'>
<div class='input-group'>
<?php echo html::input('begin', '', "class='form-control form-date' placeholder='{$lang->kanbancard->begin}'");?>
<span class='input-group-addon fix-border'>~</span>
<?php echo html::input('end', '', "class='form-control form-date' placeholder='{$lang->kanbancard->end}'");?>
</div>
</td>
</tr>
+4 -2
View File
@@ -43,11 +43,13 @@
</tr>
<tr>
<th><?php echo $lang->kanbancolumn->color;?></th>
<td><div id='color-picker'></div></td>
<td>
<div id='color-picker'></div>
<?php echo html::input('color', '#7ec5ff', "class='hidden'");?>
</td>
</tr>
<tr>
<td colspan='2' class='form-actions text-center'>
<?php echo html::hidden('color', '#272E33');?>
<?php echo html::hidden('group', $column->group);?>
<?php echo html::hidden('parent', $column->parent);?>
<?php echo html::submitButton();?>