* adjust the type of notify the story changed tasks.
This commit is contained in:
wangchunsheng
+1
-1
@@ -79,7 +79,7 @@ define('TABLE_TODO', $config->db->prefix . 'todo');
|
||||
define('TABLE_GROUP', $config->db->prefix . 'group');
|
||||
define('TABLE_GROUPPRIV', $config->db->prefix . 'groupPriv');
|
||||
define('TABLE_USERGROUP', $config->db->prefix . 'userGroup');
|
||||
define('TABLE_USERQUERY', $config->db->prefix . 'userQuery');
|
||||
//define('TABLE_USERQUERY', $config->db->prefix . 'userQuery');
|
||||
|
||||
define('TABLE_BUG', $config->db->prefix . 'bug');
|
||||
define('TABLE_CASE', $config->db->prefix . 'case');
|
||||
|
||||
@@ -35,8 +35,9 @@ $lang->copy = '复制';
|
||||
$lang->delete = '删除';
|
||||
$lang->close = '关闭';
|
||||
$lang->activate = '激活';
|
||||
$lang->delete = '删除';
|
||||
$lang->save = '保存';
|
||||
$lang->confirm = '确认';
|
||||
$lang->preview = '预览';
|
||||
$lang->actions = '操作';
|
||||
$lang->comment = '备注';
|
||||
$lang->history = '历史记录';
|
||||
@@ -55,7 +56,6 @@ $lang->reverse = '（切换顺序）';
|
||||
$lang->addFiles = '上传了附件 ';
|
||||
$lang->files = '附件 ';
|
||||
$lang->workingHour= '工时';
|
||||
$lang->preview = '预览';
|
||||
$lang->showHelp = '显示帮助';
|
||||
|
||||
/* 主导航菜单。*/
|
||||
|
||||
@@ -106,7 +106,7 @@ class project extends control
|
||||
$this->view->recTotal = $pager->recTotal;
|
||||
$this->view->recPerPage = $pager->recPerPage;
|
||||
$this->view->orderBy = $orderBy;
|
||||
$this->view->browseType = 'list';
|
||||
$this->view->browseType = $status != 'needConfirm' ? 'list' : 'needconfirm';
|
||||
|
||||
$this->display();
|
||||
}
|
||||
|
||||
@@ -94,6 +94,7 @@ $lang->project->groupTaskByConsumed = '按已消耗分组';
|
||||
$lang->project->groupTaskByLeft = '按剩余工时分组';
|
||||
$lang->project->groupTaskByType = '按任务类型分组';
|
||||
$lang->project->groupTaskByDeadline = '按截止日期分组';
|
||||
$lang->project->listTaskNeedConfrim = '需求有变动的任务';
|
||||
|
||||
$lang->project->beginAndEnd = '起止时间';
|
||||
$lang->project->lblStats = '工时统计';
|
||||
|
||||
@@ -68,5 +68,5 @@
|
||||
<?php endforeach;?>
|
||||
</table>
|
||||
</div>
|
||||
<script language='Javascript'>$('#by<?php echo $browseType;?>').addClass('active');</script>
|
||||
<script language='Javascript'>$('#<?php echo $browseType;?>').addClass('active');</script>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -80,7 +80,16 @@
|
||||
</td>
|
||||
<td>
|
||||
<?php common::printLink('task', 'edit', "taskid=$task->id", $lang->edit);?>
|
||||
<?php common::printLink('task', 'delete', "projectID=$task->project&taskid=$task->id", $lang->delete, 'hiddenwin');?>
|
||||
<?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');
|
||||
}
|
||||
?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach;?>
|
||||
@@ -88,5 +97,5 @@
|
||||
</table>
|
||||
<div class='a-right'><?php echo $pager;?></div>
|
||||
</div>
|
||||
<script language='Javascript'>$('#by<?php echo $browseType;?>').addClass('active');</script>
|
||||
<script language='Javascript'>$('#<?php echo $browseType;?>').addClass('active');</script>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -5,16 +5,17 @@
|
||||
<div id='featurebar'>
|
||||
<div class='f-left'>
|
||||
<?php
|
||||
echo "<span id='bylist'>" ; common::printLink('project', 'task', "project=$project->id", $lang->project->listTask); echo '</span>' ;
|
||||
echo "<span id='bystory'>" ; common::printLink('project', 'groupTask', "project=$project->id&groupby=story", $lang->project->groupTaskByStory); echo '</span>' ;
|
||||
echo "<span id='bystatus'>" ; common::printLink('project', 'groupTask', "project=$project->id&groupby=status", $lang->project->groupTaskByStatus); echo '</span>' ;
|
||||
echo "<span id='bypri'>" ; common::printLink('project', 'groupTask', "project=$project->id&groupby=pri", $lang->project->groupTaskByPri); echo '</span>' ;
|
||||
echo "<span id='byowner'>" ; common::printLink('project', 'groupTask', "project=$project->id&groupby=owner", $lang->project->groupTaskByOwner); echo '</span>' ;
|
||||
echo "<span id='byestimate'>"; common::printLink('project', 'groupTask', "project=$project->id&groupby=estimate",$lang->project->groupTaskByEstimate); echo '</span>' ;
|
||||
echo "<span id='byconsumed'>"; common::printLink('project', 'groupTask', "project=$project->id&groupby=consumed",$lang->project->groupTaskByConsumed); echo '</span>' ;
|
||||
echo "<span id='byleft'>" ; common::printLink('project', 'groupTask', "project=$project->id&groupby=left", $lang->project->groupTaskByLeft); echo '</span>' ;
|
||||
echo "<span id='bytype'>" ; common::printLink('project', 'groupTask', "project=$project->id&groupby=type", $lang->project->groupTaskByType); echo '</span>' ;
|
||||
echo "<span id='bydeadline'>"; common::printLink('project', 'groupTask', "project=$project->id&groupby=deadline",$lang->project->groupTaskByDeadline); echo '</span>' ;
|
||||
echo "<span id='list'>" ; common::printLink('project', 'task', "project=$project->id", $lang->project->listTask); echo '</span>' ;
|
||||
echo "<span id='story'>" ; common::printLink('project', 'groupTask', "project=$project->id&groupby=story", $lang->project->groupTaskByStory); echo '</span>' ;
|
||||
echo "<span id='status'>" ; common::printLink('project', 'groupTask', "project=$project->id&groupby=status", $lang->project->groupTaskByStatus); echo '</span>' ;
|
||||
echo "<span id='pri'>" ; common::printLink('project', 'groupTask', "project=$project->id&groupby=pri", $lang->project->groupTaskByPri); echo '</span>' ;
|
||||
echo "<span id='owner'>" ; common::printLink('project', 'groupTask', "project=$project->id&groupby=owner", $lang->project->groupTaskByOwner); echo '</span>' ;
|
||||
echo "<span id='estimate'>"; common::printLink('project', 'groupTask', "project=$project->id&groupby=estimate", $lang->project->groupTaskByEstimate); echo '</span>' ;
|
||||
echo "<span id='consumed'>"; common::printLink('project', 'groupTask', "project=$project->id&groupby=consumed", $lang->project->groupTaskByConsumed); echo '</span>' ;
|
||||
echo "<span id='left'>" ; common::printLink('project', 'groupTask', "project=$project->id&groupby=left", $lang->project->groupTaskByLeft); echo '</span>' ;
|
||||
echo "<span id='type'>" ; common::printLink('project', 'groupTask', "project=$project->id&groupby=type", $lang->project->groupTaskByType); echo '</span>' ;
|
||||
echo "<span id='deadline'>"; common::printLink('project', 'groupTask', "project=$project->id&groupby=deadline", $lang->project->groupTaskByDeadline); echo '</span>' ;
|
||||
echo "<span id='needconfirm'>" ; common::printLink('project', 'task', "project=$project->id&status=needConfirm",$lang->project->listTaskNeedConfrim); echo '</span>' ;
|
||||
?>
|
||||
</div>
|
||||
<div class='f-right'>
|
||||
|
||||
@@ -25,7 +25,6 @@ $lang->story->browse = "需求列表";
|
||||
$lang->story->create = "新增需求";
|
||||
$lang->story->change = "变更";
|
||||
$lang->story->changed = '需求变更';
|
||||
$lang->story->confirm = '确认';
|
||||
$lang->story->review = '评审';
|
||||
$lang->story->edit = "编辑需求";
|
||||
$lang->story->close = '关闭';
|
||||
|
||||
@@ -123,7 +123,8 @@ class taskModel extends model
|
||||
->leftJoin(TABLE_USER)->alias('t3')
|
||||
->on('t1.owner = t3.account')
|
||||
->where('t1.project')->eq((int)$projectID)
|
||||
->onCaseOf($status != 'all')->andWhere('t1.status')->in($status)->endCase()
|
||||
->onCaseOf($status == 'needConfirm')->andWhere('t2.version > t1.storyVersion')->andWhere('t2.status = "active"')->endCase()
|
||||
->onCaseOf($status != 'all' and $status != 'needConfirm')->andWhere('t1.status')->in($status)->endCase()
|
||||
->orderBy($orderBy)
|
||||
->page($pager)
|
||||
->fetchAll();
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
if($task->needConfirm)
|
||||
{
|
||||
echo "(<span class='warning'>{$lang->story->changed}</span> ";
|
||||
echo html::a($this->createLink('task', 'confirmStoryChange', "taskID=$task->id"), $lang->story->confirm, 'hiddenwin');
|
||||
echo html::a($this->createLink('task', 'confirmStoryChange', "taskID=$task->id"), $lang->confirm, 'hiddenwin');
|
||||
echo ")";
|
||||
}
|
||||
?>
|
||||
|
||||
@@ -163,12 +163,13 @@ caption {border:1px solid #e4e4e4; background:#efefef; margin:0; padding:5
|
||||
.bg-gray {background-color:#efefef;}
|
||||
|
||||
/*-----------------------COLOR SETTING----------------------------*/
|
||||
.red {color:red;}
|
||||
.blue {color:blue}
|
||||
.yellow {color:yellow;}
|
||||
.gray {color:gray;}
|
||||
.green {color:green;}
|
||||
.star {color:red; font-size:14px; font-weight:bold}
|
||||
.red {color:red;}
|
||||
.blue {color:blue}
|
||||
.yellow {color:yellow;}
|
||||
.gray {color:gray;}
|
||||
.green {color:green;}
|
||||
.star {color:red; font-size:14px; font-weight:bold}
|
||||
.warning {background:yellow; color:red; font-weight:bold}
|
||||
|
||||
/*-----------------------SPECIAL PART SETTING--------------------*/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user