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

* Fix bug.

Browse Source
This commit is contained in:
滔哥
2018-01-17 09:16:25 +08:00
parent 660ac1f62b
commit 8f30956519
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/view/todo.html.php
+1 -1
View File
@@ -78,7 +78,7 @@
<td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
<td class='text-right'>
<?php
if($todo->status != 'done') echo html::a(helper::createLink('todo', 'assignto', "todoID=$todo->id"), '<i class="icon icon-hand-right"></i>', '', "data-toggle='assigntoModal' class='btn-icon'");
if($todo->status != 'done') common::printIcon('todo', 'assignto', "todoID=$todo->id", $todo, 'list', 'hand-right', '', "btn-icon", '', "data-toggle='assigntoModal'", $lang->todo->assignTo);
if($todo->status == 'done') common::printIcon('todo', 'activate', "id=$todo->id", $todo, 'list', 'magic', 'hiddenwin');
if($todo->status != 'done') common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'list', 'ok-sign', 'hiddenwin');
if($todo->status == 'done') common::printIcon('todo', 'close', "id=$todo->id", $todo, 'list', 'off', 'hiddenwin');
module/todo/lang/zh-cn.php
+1 -1
View File
@@ -13,7 +13,7 @@ $lang->todo->common = '待办';
$lang->todo->index = "待办一览";
$lang->todo->create = "新增";
$lang->todo->createCycle = "创建周期待办";
$lang->todo->assignTo = "指派";
$lang->todo->assignTo = "指派给";
$lang->todo->activate = "激活";
$lang->todo->batchCreate = "批量添加";
$lang->todo->edit = "编辑";
module/todo/view/view.html.php
+10 -1
View File
@@ -66,6 +66,16 @@
<th><?php echo $lang->todo->beginAndEnd;?></th>
<td><?php if(isset($times[$todo->begin])) echo $times[$todo->begin]; if(isset($times[$todo->end])) echo ' ~ ' . $times[$todo->end];?></td>
</tr>
<?php if(isset($todo->assignedTo)):?>
<tr>
<th><?php echo $lang->todo->assignTo;?></th>
<td><?php echo $todo->assignedTo;?></td>
</tr>
<tr>
<th><?php echo $lang->todo->assignTo . $lang->todo->date;?></th>
<td><?php echo $todo->assignedDate;?></td>
</tr>
<?php endif;?>
</table>
</fieldset>
<?php if($todo->cycle):?>
@@ -108,7 +118,6 @@
<?php
if($todo->account == $app->user->account)
{
//if($todo->status != 'done') echo html::a($this->createLink('todo', 'assignTo', "todoID=$todo->id"), "<i class='icon icon-hand-right'></i> " . $lang->todo->assignTo, '', "class='btn showinonlybody'");
if($todo->status != 'closed') echo html::a($this->createLink('todo', 'edit', "todoID=$todo->id"), "<i class='icon icon-edit'></i> " . $lang->todo->edit, '', "class='btn showinonlybody'");
if($todo->status == 'done' || $todo->status == 'closed') echo html::a($this->createLink('todo', 'activate', "todoID=$todo->id"), "<i class='icon icon-magic'></i> " . $lang->todo->activate, 'hiddenwin', "class='btn showinonlybody'");
if($todo->status == 'done') echo html::a($this->createLink('todo', 'close', "todoID=$todo->id"), "<i class='icon icon-off'></i> " . $lang->todo->close, 'hiddenwin', "class='btn showinonlybody'");