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

+ add feature bars to my task page.

Browse Source
This commit is contained in:
wangchunsheng
2010-11-29 03:40:02 +00:00
parent a1870df48e
commit b7df1c565c
8 changed files with 62 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+5 -2
View File
@@ -89,10 +89,11 @@ class my extends control
/**
* My tasks.
*
* @param string $type the browse type
* @access public
* @return void
*/
public function task()
public function task($type = 'assignedto')
{
/* Save session. */
$this->session->set('taskList', $this->app->getURI(true));
@@ -102,7 +103,9 @@ class my extends control
$this->view->header->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->task;
$this->view->position[] = $this->lang->my->task;
$this->view->tabID = 'task';
$this->view->tasks = $this->loadModel('task')->getUserTasks($this->app->user->account, 'wait,doing');
$this->view->tasks = $this->loadModel('task')->getUserTasks($this->app->user->account, $type);
$this->view->type = $type;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->display();
}
module/my/lang/en.php
+7 -1
View File
@@ -1,7 +1,7 @@
<?php
$lang->my->common = 'Dashboard';
/* 方法列表。*/
/* Methods. */
$lang->my->index = 'Index';
$lang->my->todo = 'Todo';
$lang->my->task = 'Task';
@@ -12,3 +12,9 @@ $lang->my->project = 'Project';
$lang->my->team = 'Team';
$lang->my->profile = 'Profile';
$lang->my->editProfile = 'Edit profile';
$lang->my->taskMenu->assignedToMe = 'To me';
$lang->my->taskMenu->openedByMe = 'My opened';
$lang->my->taskMenu->finishedByMe = 'My finished';
$lang->my->taskMenu->closedByMe = 'My closed';
$lang->my->taskMenu->canceledByMe = 'My canceled';
module/my/lang/zh-cn.php
+6
View File
@@ -12,3 +12,9 @@ $lang->my->project = '我的项目';
$lang->my->team = '我的团队';
$lang->my->profile = '我的档案';
$lang->my->editProfile = '更新信息';
$lang->my->taskMenu->assignedToMe = '指派给我';
$lang->my->taskMenu->openedByMe = '由我创建';
$lang->my->taskMenu->finishedByMe = '由我完成';
$lang->my->taskMenu->closedByMe = '由我关闭';
$lang->my->taskMenu->canceledByMe = '由我取消';
module/my/view/bug.html.php
+1 -3
View File
@@ -63,7 +63,5 @@
</table>
<?php $pager->show();?>
</div>
<script language='javascript'>
$("#<?php echo $type;?>Tab").addClass('active');
</script>
<script language='javascript'>$("#<?php echo $type;?>Tab").addClass('active');</script>
<?php include '../../common/view/footer.html.php';?>
module/my/view/task.html.php
+27 -4
View File
@@ -13,19 +13,33 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<div class='yui-d0'>
<table class='table-1 tablesorter' id='tasktable'>
<div id='featurebar'>
<div class='f-left'>
<?php
echo "<span id='assignedtoTab'>" . html::a(inlink('task', "type=assignedto"), $lang->my->taskMenu->assignedToMe) . "</span>";
echo "<span id='openedbyTab'>" . html::a(inlink('task', "type=openedby"), $lang->my->taskMenu->openedByMe) . "</span>";
echo "<span id='finishedbyTab'>" . html::a(inlink('task', "type=finishedby"), $lang->my->taskMenu->finishedByMe) . "</span>";
echo "<span id='closedbyTab'>" . html::a(inlink('task', "type=closedby"), $lang->my->taskMenu->closedByMe) . "</span>";
echo "<span id='canceledbyTab'>" . html::a(inlink('task', "type=canceledby"), $lang->my->taskMenu->canceledByMe) . "</span>";
?>
</div>
</div>
</div>
<div class='yui-d0'>
<table class='table-1 tablesorter fixed' id='tasktable'>
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-pri'><?php echo $lang->priAB;?></th>
<th><?php echo $lang->task->project;?></th>
<th class='w-150px'><?php echo $lang->task->project;?></th>
<th><?php echo $lang->task->name;?></th>
<th class='w-hour'><?php echo $lang->task->estimateAB;?></th>
<th class='w-hour'><?php echo $lang->task->consumedAB;?></th>
<th class='w-hour'><?php echo $lang->task->leftAB;?></th>
<th class='w-date'><?php echo $lang->task->deadlineAB;?></th>
<th class='w-status'><?php echo $lang->statusAB;?></th>
<th class='{sorter:false}'><?php echo $lang->actions;?></th>
<th class='w-user'><?php echo $lang->openedByAB;?></th>
<th class='w-120px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -40,10 +54,19 @@
<td><?php echo $task->left;?></td>
<td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
<td class='<?php echo $task->status;?>'><?php echo $lang->task->statusList[$task->status];?></td>
<td><?php echo html::a($this->createLink('task', 'edit', "taskID=$task->id"), $lang->task->edit, '_blank');?></td>
<td><?php echo $users[$task->openedBy];?></td>
<td>
<?php
if(!(($task->status == 'wait') and common::printLink('task', 'start', "taskID=$task->id", $lang->task->buttonStart))) echo $lang->task->buttonStart . ' ';
if(!(($task->status == 'wait' or $task->status == 'doing') and common::printLink('task', 'finish', "taskID=$task->id", $lang->task->buttonDone))) echo $lang->task->buttonDone . ' ';
if(!(($task->status == 'done' or $task->status == 'cancel') and common::printLink('task', 'close', "taskID=$task->id", $lang->task->buttonClose))) echo $lang->task->buttonClose . ' ';
if(!(($task->status == 'closed' or $task->status == 'done' or $task->status == 'cancel') and common::printLink('task', 'activate', "taskID=$task->id", $lang->task->buttonActivate))) echo $lang->task->buttonActivate . ' ';
?>
</td>
</tr>
<?php endforeach;?>
</tbody>
</table>
</div>
<script language='javascript'>$("#<?php echo $type;?>Tab").addClass('active');</script>
<?php include '../../common/view/footer.html.php';?>
module/project/view/task.html.php
+6 -11
View File
@@ -29,7 +29,7 @@
<th class='w-date'> <?php common::printOrderLink('deadline', $orderBy, $vars, $lang->task->deadlineAB);?></th>
<th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th><?php common::printOrderLink('story', $orderBy, $vars, $lang->task->story);?></th>
<th class='w-70px {sorter:false}'><?php echo $lang->actions;?></th>
<th class='w-150px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -66,16 +66,11 @@
?>
</td>
<td>
<?php common::printLink('task', 'edit', "taskid=$task->id", $lang->edit);?>
<?php
if($browseType == 'needconfirm')
{
common::printLink('task', 'confirmStoryChange', "taskid=$task->id", $lang->confirm, 'hiddenwin');
}
else
{
common::printLink('task', 'delete', "projectID=$task->project&taskid=$task->id", $lang->delete, 'hiddenwin');
}
<?php
if(!(($task->status == 'wait' or $task->status == 'doing') and common::printLink('task', 'finish', "taskID=$task->id", $lang->task->buttonDone))) echo $lang->task->buttonDone . ' ';
if(!(($task->status == 'done' or $task->status == 'cancel') and common::printLink('task', 'close', "taskID=$task->id", $lang->task->buttonClose))) echo $lang->task->buttonClose . ' ';
if(!common::printLink('task', 'edit', "taskID=$task->id", $lang->task->buttonEdit)) echo $lang->task->buttonEdit . ' ';
if($browseType == 'needconfirm') common::printLink('task', 'confirmStoryChange', "taskid=$task->id", $lang->confirm, 'hiddenwin');
?>
</td>
</tr>
module/task/model.php
+8 -5
View File
@@ -342,11 +342,11 @@ class taskModel extends model
* Get tasks of a user.
*
* @param string $account
* @param string $status
* @param string $type the query type
* @access public
* @return array
*/
public function getUserTasks($account, $status = 'all')
public function getUserTasks($account, $type = 'assignedto')
{
$tasks = $this->dao->select('t1.*, t2.id as projectID, t2.name as projectName, t3.id as storyID, t3.title as storyTitle, t3.status AS storyStatus, t3.version AS latestStoryVersion')
->from(TABLE_TASK)->alias('t1')
@@ -354,9 +354,12 @@ class taskModel extends model
->on('t1.project = t2.id')
->leftjoin(TABLE_STORY)->alias('t3')
->on('t1.story = t3.id')
->where('t1.assignedTo')->eq($account)
->andWhere('t1.deleted')->eq(0)
->beginIF($status != 'all')->andWhere('t1.status')->in($status)->fi()
->where('t1.deleted')->eq(0)
->beginIF($type == 'openedby')->andWhere('t1.openedBy')->eq($account)->fi()
->beginIF($type == 'assignedto')->andWhere('t1.assignedto')->eq($account)->fi()
->beginIF($type == 'finishedby')->andWhere('t1.finishedby')->eq($account)->fi()
->beginIF($type == 'closedby')->andWhere('t1.closedby')->eq($account)->fi()
->beginIF($type == 'canceledby')->andWhere('t1.canceledby')->eq($account)->fi()
->fetchAll();
if($tasks) return $this->processTasks($tasks);
return array();
module/task/view/view.html.php
+2 -2
View File
@@ -22,7 +22,7 @@
if(!$task->deleted)
{
//if(!($task->status != 'closed' and $task->status != 'cancel' and common::printLink('task', 'logEfforts', "taskID=$task->id", $lang->task->buttonLogEfforts))) echo $lang->task->buttonLogEfforts . ' ';
if(!(($task->status == 'wait' or $task->status == 'cancel') and common::printLink('task', 'start', "taskID=$task->id", $lang->task->buttonStart))) echo $lang->task->buttonStart . ' ';
if(!(($task->status == 'wait') and common::printLink('task', 'start', "taskID=$task->id", $lang->task->buttonStart))) echo $lang->task->buttonStart . ' ';
if(!(($task->status == 'wait' or $task->status == 'doing') and common::printLink('task', 'finish', "taskID=$task->id", $lang->task->buttonDone))) echo $lang->task->buttonDone . ' ';
if(!(($task->status == 'done' or $task->status == 'cancel') and common::printLink('task', 'close', "taskID=$task->id", $lang->task->buttonClose))) echo $lang->task->buttonClose . ' ';
if(!(($task->status == 'wait' or $task->status == 'doing') and common::printLink('task', 'cancel', "taskID=$task->id", $lang->task->buttonCancel))) echo $lang->task->buttonCancel . ' ';
@@ -49,7 +49,7 @@
<?php
if(!$task->deleted)
{
if(!(($task->status == 'wait' or $task->status == 'cancel') and common::printLink('task', 'start', "taskID=$task->id", $lang->task->buttonStart))) echo $lang->task->buttonStart . ' ';
if(!(($task->status == 'wait') and common::printLink('task', 'start', "taskID=$task->id", $lang->task->buttonStart))) echo $lang->task->buttonStart . ' ';
if(!(($task->status == 'wait' or $task->status == 'doing') and common::printLink('task', 'finish', "taskID=$task->id", $lang->task->buttonDone))) echo $lang->task->buttonDone . ' ';
if(!(($task->status == 'done' or $task->status == 'cancel') and common::printLink('task', 'close', "taskID=$task->id", $lang->task->buttonClose))) echo $lang->task->buttonClose . ' ';
if(!(($task->status == 'wait' or $task->status == 'doing') and common::printLink('task', 'cancel', "taskID=$task->id", $lang->task->buttonCancel))) echo $lang->task->buttonCancel . ' ';