*Finish task #sprint/168_zhengrunyu_45148.

This commit is contained in:
zhengrunyu
2021-11-26 08:30:55 +08:00
parent 0edae7664d
commit 2f41e85fda
5 changed files with 26 additions and 3 deletions
-1
View File
@@ -700,7 +700,6 @@ class executionModel extends model
$now = helper::now();
$execution = fixer::input('post')
->add('realBegan', helper::today())
->setDefault('status', 'doing')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
+8
View File
@@ -30,6 +30,14 @@
<td><?php echo html::hidden('status', 'closed');?></td>
</tr>
<?php $this->printExtendFields($execution, 'table');?>
<tr>
<th><?php echo $lang->execution->realEnd;?></th>
<td>
<div class='w-150px'>
<?php echo html::input('realEnd',(!empty($execution->realEnd) && $execution->realEnd != '0000-00-00' ? $execution->realEnd : date('Y-m-d')), "class='form-control form-date'");?>
</div>
</td>
</tr>
<tr>
<th class='w-50px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
+8
View File
@@ -26,6 +26,14 @@
<table class='table table-form'>
<tbody>
<?php $this->printExtendFields($execution, 'table', 'columns=2');?>
<tr>
<th><?php echo $lang->execution->realBegan;?></th>
<td>
<div class = 'w-150px'>
<?php echo html::input('realBegan',(!empty($execution->realBegan) && $execution->realBegan != '0000-00-00' ? $execution->realBegan : date('Y-m-d')), "class='form-control form-date'");?>
</div>
</td>
</tr>
<tr>
<th class='w-40px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
+2 -2
View File
@@ -239,7 +239,7 @@
<th><?php echo $lang->execution->begin;?></th>
<td><?php echo $execution->begin;?></td>
<th><?php echo $lang->execution->realBegan;?></th>
<?php if ($execution->realBegan == 0000-00-00): ?>
<?php if ($execution->realBegan == '0000-00-00'): ?>
<td><?php echo '';?></td>
<?php else :;?>
<td><?php echo $execution->realBegan;?></td>
@@ -249,7 +249,7 @@
<th><?php echo $lang->execution->end;?></th>
<td><?php echo $execution->end;?></td>
<th><?php echo $lang->execution->realEnd;?></th>
<?php if ($execution->realEnd == 0000-00-00): ?>
<?php if ($execution->realEnd == '0000-00-00'): ?>
<td><?php echo '';?></td>
<?php else :;?>
<td><?php echo $execution->realEnd;?></td>
+8
View File
@@ -30,6 +30,14 @@
<td><?php echo html::hidden('status', 'closed');?></td>
</tr>
<?php $this->printExtendFields($project, 'table');?>
<tr>
<th><?php echo $lang->project->realEnd;?></th>
<td>
<div class='w-150px'>
<?php echo html::input('realEnd',(!empty($project->realEnd) && $project->realEnd != '0000-00-00' ? $project->realEnd : date('Y-m-d')), "class='form-control form-date'");?>
</div>
</td>
</tr>
<tr>
<th class='w-50px'><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>