Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2017-08-16 16:13:05 +08:00
parent e3d3d6f573 c6165b16d5
commit 0508eefd70
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/dev/control.php
-1
View File
@@ -46,7 +46,6 @@ class dev extends control
$this->view->position[] = $this->lang->dev->db;
$this->view->tables = $this->dev->getTables();
$this->view->tab = 'db';
$this->view->selectedTable = $table;
$this->view->tab = 'db';
$this->view->fields = $table ? $this->dev->getFields($table) : array();
module/task/model.php
+25 -2
View File
@@ -370,7 +370,10 @@ class taskModel extends model
if(!$task->finishedBy) $task->finishedBy = $this->app->user->account;
if($task->closedReason) $task->closedDate = $now;
$task->finishedDate = $oldTask->status == 'done' ? $oldTask->finishedDate : $now;
}
$task->canceledBy = '';
$task->canceledDate = '';
}
break;
case 'cancel':
{
@@ -379,6 +382,9 @@ class taskModel extends model
if(!$task->canceledBy) $task->canceledBy = $this->app->user->account;
if(!$task->canceledDate) $task->canceledDate = $now;
$task->finishedBy = '';
$task->finishedDate = '';
}
break;
case 'closed':
@@ -391,7 +397,24 @@ class taskModel extends model
{
if($task->consumed > 0 and $task->left > 0) $task->status = 'doing';
if($task->left == $oldTask->left and $task->consumed == 0) $task->left = $task->estimate;
$task->canceledDate = '';
$task->finishedDate = '';
$task->closedDate = '';
}
break;
case 'doing':
{
$task->canceledDate = '';
$task->finishedDate = '';
$task->closedDate = '';
}
break;
case 'pause':
{
$task->finishedDate = '';
}
default:break;
}
if($task->assignedTo) $task->assignedDate = $now;
@@ -403,7 +426,7 @@ class taskModel extends model
->checkIF($task->estimate != false, 'estimate', 'float')
->checkIF($task->consumed != false, 'consumed', 'float')
->checkIF($task->left != false, 'left', 'float')
->checkIF($task->left == 0 and $task->status != 'cancel' and $task->status != 'closed' and $task->consumed != 0, 'status', 'equal', 'done')
->checkIF($task->left == 0 and $task->status != 'cancel' and $task->status != 'closed' and $task->status != 'wait' and $task->consumed != 0, 'status', 'equal', 'done')
->batchCheckIF($task->status == 'wait' or $task->status == 'doing', 'finishedBy, finishedDate,canceledBy, canceledDate, closedBy, closedDate, closedReason', 'empty')
module/task/view/edit.html.php
+6 -6
View File
@@ -137,23 +137,23 @@
</tr>
<tr>
<th><?php echo $lang->task->finishedBy;?></th>
<td><?php echo html::select('finishedBy', $members, $task->finishedBy, "class='form-control chosen'");?></td>
<td><?php echo html::select('finishedBy', $members, $task->finishedBy, "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->task->finishedDate;?></th>
<td><?php echo html::input('finishedDate', $task->finishedDate, 'class="form-control" autocomplete="off"');?></td>
<td><?php echo html::input('finishedDate', $task->finishedDate, 'class="form-control form-date"');?></td>
</tr>
<tr>
<th><?php echo $lang->task->canceledBy;?></th>
<td><?php echo html::select('canceledBy', $users, $task->canceledBy, 'class="form-control chosen"');?></td>
<td><?php echo html::select('canceledBy', $users, $task->canceledBy, 'class="form-control"');?></td>
</tr>
<tr>
<th><?php echo $lang->task->canceledDate;?></th>
<td><?php echo html::input('canceledDate', $task->canceledDate, 'class="form-control" autocomplete="off"');?></td>
<td><?php echo html::input('canceledDate', $task->canceledDate, 'class="form-control form-date"');?></td>
</tr>
<tr>
<th><?php echo $lang->task->closedBy;?></th>
<td><?php echo html::select('closedBy', $users, $task->closedBy, 'class="form-control chosen"');?></td>
<td><?php echo html::select('closedBy', $users, $task->closedBy, 'class="form-control"');?></td>
</tr>
<tr>
<th><?php echo $lang->task->closedReason;?></th>
@@ -161,7 +161,7 @@
</tr>
<tr>
<th><?php echo $lang->task->closedDate;?></th>
<td><?php echo html::input('closedDate', $task->closedDate, 'class="form-control" autocomplete="off"');?></td>
<td><?php echo html::input('closedDate', $task->closedDate, 'class="form-control form-date"');?></td>
</tr>
</table>
</fieldset>