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

* Task#3586.

Browse Source
This commit is contained in:
滔哥
2018-01-11 21:53:28 +08:00
parent 9dc01a4ba2
commit 736c265302
10 changed files with 334 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/todo/view/assignto.html.php
Executable
+88
View File
@@ -0,0 +1,88 @@
<?php
/**
* The batch create view of todo module of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Congzhi Chen <congzhi@cnezsoft.com>
* @package todo
* @version $Id: create.html.php 2741 2012-04-07 07:24:21 $
* @link http://www.zentao.net
*/
?>
<div class="modal fade" id="assigntoModal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title"><i class="icon-file-text"></i> <?php echo $lang->todo->assignTo;?></h4>
</div>
<div class="modal-body">
<form class='form-condensed' method='post' target='hiddenwin' id="todoAssignForm">
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->todo->assignTo;?></th>
<td class='w-p25-f'>
<?php echo html::select('assignedTo', $members, '', "class='form-control chosen'");?>
</td><td></td>
</tr>
<tr>
<th><?php echo $lang->todo->date;?></th>
<td>
<div class='input-group'>
<?php echo html::input('date', $date, "class='form-control form-date' id='todoDate'");?>
<span class='input-group-addon'><input type='checkbox' name="future" id='switchDate' onclick='switchDateTodo(this);'> <?php echo $lang->todo->periods['future'];?></span>
</div>
</td><td></td>
</tr>
<tr>
<th><?php echo $lang->todo->beginAndEnd;?></th>
<td>
<div class='input-group'>
<?php echo html::select('begin', $times, date('Y-m-d') != $date ? key($times) : $time, 'onchange=selectNext(); class="form-control chosen" style="width: 50%;"') . html::select('end', $times, '', 'class="form-control chosen" style="width: 50%; margin-left:-1px"');?>
</div>
</td>
<td><input type='checkbox' id='switchDate' onclick='switchDateFeature(this);' name="lblDisableDate"> <?php echo $lang->todo->lblDisableDate;?></td>
</tr>
<tfoot>
<tr><td colspan='3'><?php echo html::submitButton();?></td></tr>
</tfoot>
</table>
</form>
</div>
</div>
</div>
</div>
<script>
$("a[data-toggle='assigntoModal']").on('click', function(){
$('#assigntoModal').modal('show');
$('#todoAssignForm').attr('action', $(this).attr('href'));
return false;
});
function switchDateTodo(switcher)
{
if(switcher.checked)
{
$('#todoDate').attr('disabled','disabled');
}
else
{
$('#todoDate').removeAttr('disabled');
}
}
function switchDateFeature(switcher)
{
if(switcher.checked)
{
$('#begin').attr('disabled','disabled').trigger('chosen:updated');
$('#end').attr('disabled','disabled').trigger('chosen:updated');
}
else
{
$('#begin').removeAttr('disabled').trigger('chosen:updated');
$('#end').removeAttr('disabled').trigger('chosen:updated');
}
}
</script>
module/todo/view/view.html.php
+13 -9
View File
@@ -24,7 +24,7 @@
<div class='main'>
<fieldset>
<legend>
<?php
<?php
echo $lang->todo->desc;
if($todo->type == 'bug') echo html::a($this->createLink('bug', 'view', "id={$todo->idvalue}"), ' BUG#' . $todo->idvalue);
if($todo->type == 'task') echo html::a($this->createLink('task', 'view', "id={$todo->idvalue}"), ' TASK#' . $todo->idvalue);
@@ -40,7 +40,7 @@
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->todo->legendBasic;?></legend>
<table class='table table-data table-condensed table-borderless'>
<table class='table table-data table-condensed table-borderless'>
<tr>
<th><?php echo $lang->todo->pri;?></th>
<td><?php echo $lang->todo->priList[$todo->pri];?></td>
@@ -71,7 +71,7 @@
<?php $todo->config = json_decode($todo->config);?>
<fieldset>
<legend><?php echo $lang->todo->cycle;?></legend>
<table class='table table-data table-condensed table-borderless'>
<table class='table table-data table-condensed table-borderless'>
<tr>
<th class='w-80px'><?php echo $lang->todo->beginAndEnd?></th>
<td><?php echo $todo->config->begin . " ~ " . $todo->config->end;?></td>
@@ -105,6 +105,15 @@
</div>
<div class='panel-footer text-center'>
<?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'");
echo html::a($this->createLink('todo', 'delete', "todoID=$todo->id"), "<i class='icon icon-remove'></i> " . $lang->todo->delete, 'hiddenwin', "class='btn showinonlybody'");
}
if($this->session->todoList)
{
$browseLink = $this->session->todoList;
@@ -118,7 +127,7 @@
$browseLink = $this->createLink('user', 'todo', "account=$todo->account");
}
if($todo->status != 'done')
if($todo->status != 'done' && $todo->status != 'closed')
{
echo "<div class='btn-group dropup'>";
echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), "<i class='icon icon-ok'></i> " . $lang->todo->finish, 'hiddenwin', "class='btn showinonlybody btn-success'");
@@ -140,11 +149,6 @@
echo "</div>";
}
if($todo->account == $app->user->account)
{
common::printIcon('todo', 'edit', "todoID=$todo->id");
common::printIcon('todo', 'delete', "todoID=$todo->id", '', 'button', '', 'hiddenwin');
}
common::printRPN($browseLink);
?>
</div>