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

* add finishedByMe tab.

Browse Source
This commit is contained in:
wangchunsheng
2010-11-30 06:11:01 +00:00
parent cef1b477f5
commit 9b8ca312f6
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/lang/en.php
+2 -1
View File
@@ -83,7 +83,8 @@ $lang->project->ajaxGetProducts= "API: get project's products";
/* Browse. */
$lang->project->allTasks = 'All';
$lang->project->assignedToMe = 'My';
$lang->project->assignedToMe = 'To me';
$lang->project->finishedByMe = 'My done';
$lang->project->statusWait = 'Wait';
$lang->project->statusDoing = 'Doing';
$lang->project->statusDone = 'Done';
module/project/lang/zh-cn.php
+1
View File
@@ -84,6 +84,7 @@ $lang->project->ajaxGetProducts= '接口：获得项目产品列表';
/* 分组浏览。*/
$lang->project->allTasks = '所有任务';
$lang->project->assignedToMe = '指派给我';
$lang->project->finishedByMe = '由我完成';
$lang->project->statusWait = '未开始';
$lang->project->statusDoing = '进行中';
$lang->project->statusDone = '已完成';
module/project/view/taskheader.html.php
+1
View File
@@ -11,6 +11,7 @@ function switchGroup(projectID, groupBy)
<?php
echo "<span id='allTab'>" ; common::printLink('project', 'task', "project=$project->id", $lang->project->allTasks); echo '</span>' ;
echo "<span id='assignedtomeTab'>"; common::printLink('project', 'task', "project=$project->id&type=assignedtome", $lang->project->assignedToMe); echo '</span>' ;
echo "<span id='finishedbymeTab'>"; common::printLink('project', 'task', "project=$project->id&type=finishedbyme", $lang->project->finishedByMe); echo '</span>' ;
echo "<span id='waitTab'>" ; common::printLink('project', 'task', "project=$project->id&type=wait", $lang->project->statusWait); echo '</span>' ;
echo "<span id='doingTab'>" ; common::printLink('project', 'task', "project=$project->id&type=doing", $lang->project->statusDoing); echo '</span>' ;
echo "<span id='doneTab'>" ; common::printLink('project', 'task', "project=$project->id&type=done", $lang->project->statusDone); echo '</span>' ;
module/task/model.php
+2 -1
View File
@@ -306,8 +306,9 @@ class taskModel extends model
->andWhere('t1.deleted')->eq(0)
->beginIF($type == 'needconfirm')->andWhere('t2.version > t1.storyVersion')->andWhere("t2.status = 'active'")->fi()
->beginIF($type == 'assignedtome')->andWhere('t1.assignedTo')->eq($this->app->user->account)->fi()
->beginIF($type == 'finishedbyme')->andWhere('t1.finishedby')->eq($this->app->user->account)->fi()
->beginIF($type == 'delayed')->andWhere('deadline')->between('1970-1-1', helper::now())->fi()
->beginIF(strpos('all|needconfirm|assignedtome|delayed', $type) === false)->andWhere('t1.status')->in($type)->fi()
->beginIF(strpos('all|needconfirm|assignedtome|delayed|finishedbyme', $type) === false)->andWhere('t1.status')->in($type)->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll();