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

* add task progress to datatable and adjust task view page of create method.

Browse Source
This commit is contained in:
chenfeiCF
2016-11-22 10:38:33 +08:00
parent 26a9b56aa8
commit 54419ad74b
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/config.php
+5
View File
@@ -89,6 +89,11 @@ $config->task->datatable->fieldList['left']['fixed'] = 'no';
$config->task->datatable->fieldList['left']['width'] = '40';
$config->task->datatable->fieldList['left']['required'] = 'no';
$config->task->datatable->fieldList['progess']['title'] = 'progess';
$config->task->datatable->fieldList['progess']['fixed'] = 'no';
$config->task->datatable->fieldList['progess']['width'] = '40';
$config->task->datatable->fieldList['progess']['required'] = 'no';
$config->task->datatable->fieldList['deadline']['title'] = 'deadlineAB';
$config->task->datatable->fieldList['deadline']['fixed'] = 'no';
$config->task->datatable->fieldList['deadline']['width'] = '70';
module/task/css/create.css
+2 -2
View File
@@ -6,6 +6,6 @@
.chosen-container {max-width: 980px}
.minw-80px {min-width: 80px;}
.minw-60px {min-width: 60px;}
.minw-80px {min-width: 120px;}
.minw-60px {min-width: 50px;}
module/task/model.php
+3
View File
@@ -1624,6 +1624,9 @@ class taskModel extends model
case 'left':
echo round($task->left, 1);
break;
case 'progess':
echo $task->progess . '%';
break;
case 'deadline':
if(substr($task->deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);
break;
module/task/view/create.html.php
+6 -6
View File
@@ -114,12 +114,12 @@
<tr>
<th><?php echo $lang->task->desc;?></th>
<td colspan='3'><?php echo html::textarea('desc', $task->desc, "rows='10' class='form-control'");?></td>
</tr>
<?php
$hiddenEstStarted = strpos(",$showFields,", ',estStarted,') === false;
$hiddenDeadline = strpos(",$showFields,", ',deadline,') === false;
$hiddenMailto = strpos(",$showFields,", ',mailto,') === false;
?>
</tr>
<?php
$hiddenEstStarted = strpos(",$showFields,", ',estStarted,') === false;
$hiddenDeadline = strpos(",$showFields,", ',deadline,') === false;
$hiddenMailto = strpos(",$showFields,", ',mailto,') === false;
?>
<?php if(!$hiddenEstStarted or !$hiddenDeadline or !$hiddenMailto):?>
<tr>
<th><?php echo ($hiddenEstStarted and $hiddenDeadline) ? $lang->task->mailto : $lang->task->datePlan;?></th>