|
+ |
|
|
|
@@ -78,6 +79,7 @@ function selectProject(projectID)
owner == $app->user->account ? 'style=color:red' : '';?>
| createLink('task', 'view', "task=$task->id"), sprintf('%03d', $task->id)); else printf('%03d', $task->id);?> |
+ pri;?> |
name;?> |
>ownerRealName;?> |
estimate;?> |
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 6774335442..a23ac48b59 100644
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -27,9 +27,9 @@ $lang->task->create = "新增任务";
$lang->task->edit = "更新任务";
$lang->task->delete = "删除任务";
$lang->task->view = "查看任务";
-$lang->task->ajaxGetUserTasks = "ajax:我的任务";
-$lang->task->confirmDelete = "您确定要删除这个任务吗?";
+$lang->task->ajaxGetUserTasks = "ajax:我的任务";
+$lang->task->confirmDelete = "您确定要删除这个任务吗?";
$lang->task->id = '编号';
$lang->task->project = '所属项目';
@@ -47,6 +47,11 @@ $lang->task->statusList->wait = '未开始';
$lang->task->statusList->doing = '进行中';
$lang->task->statusList->done = '已完成';
+$lang->task->priList[3] = '一般';
+$lang->task->priList[1] = '最高';
+$lang->task->priList[2] = '较高';
+$lang->task->priList[4] = '最低';
+
$lang->task->buttonEdit = '编辑';
$lang->task->buttonBackToList = '返回';
diff --git a/module/task/model.php b/module/task/model.php
index ca83f5235a..023ad160f2 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -102,6 +102,20 @@ class taskModel extends model
->fetchAll();
}
+ /* 获得用户的任务列表。*/
+ public function getUserTasks($account, $status = 'all')
+ {
+ $sql = $this->dao->select('t1.*, t2.id as projectID, t2.name as projectName, t3.id as storyID, t3.title as storyTitle')
+ ->from(TABLE_TASK)->alias('t1')
+ ->leftjoin(TABLE_PROJECT)->alias('t2')
+ ->on('t1.project = t2.id')
+ ->leftjoin(TABLE_STORY)->alias('t3')
+ ->on('t1.story = t3.id')
+ ->where('t1.owner')->eq($account);
+ if($status != 'all') $sql->andwhere('t1.status')->in($status);
+ return $sql->fetchAll();
+ }
+
/* 获得用户的任务id=>name列表。*/
public function getUserTaskPairs($account, $status = 'all')
{
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 4d84a2201b..1d1972ba1b 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -51,6 +51,11 @@
task->estimate;?> |
|
+
+ | task->pri;?> |
+ task->priList, '', 'class=select-3');?>
+ |
+
|
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 3d7e861acb..0971157161 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -63,6 +63,10 @@
task->status;?> |
task->statusList, $task->status, 'class=select-3');?> |
+
+ | task->pri;?> |
+ task->priList, $task->status, 'class=select-3');?>
+ |
| comment;?> |
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 777ba0506a..3f37f22a2d 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -70,6 +70,10 @@
| task->status;?> |
show($lang->task->statusList, $task->status);?> |
+
+ | task->pri;?> |
+ show($lang->task->priList, $task->pri);?> |
+