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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Yagami
2019-09-02 15:53:19 +08:00
parent 626ac77395 7a29a3b98e
commit 5ee62cd458
5 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/projectoverviewblock.html.php
+1 -1
View File
@@ -18,7 +18,7 @@
<div class="tile">
<div class="tile-title"><?php echo $lang->project->allProject;?></div>
<div class="tile-amount"><?php echo $total;?></div>
<a class="btn btn-primary btn-circle btn-icon-right btn-sm" href="<?php echo $this->createLink('project', 'all');?>"><?php echo $lang->project->viewAll;?> <span class="label label-badge label-icon"><i class="icon icon-arrow-right"></i></span></a>
<a class="btn btn-primary btn-circle btn-icon-right btn-sm" href="<?php echo $this->createLink('project', 'all', 'type=all');?>"><?php echo $lang->project->viewAll;?> <span class="label label-badge label-icon"><i class="icon icon-arrow-right"></i></span></a>
</div>
</div>
<div class="col-8 text-middle">
module/block/view/projectstatisticblock.html.php
+1 -1
View File
@@ -139,7 +139,7 @@ $(function()
</tr>
<tr>
<td class='text-right'><?php echo $lang->task->noFinished;?> :</td>
<td class='text-left'><?php echo empty($project->undoneTasks) ? 0 : html::a($this->createLink('project', 'task', "projectID={$project->id}&status=unclosed"), $project->undoneTasks);?></td>
<td class='text-left'><?php echo empty($project->undoneTasks) ? 0 : html::a($this->createLink('project', 'task', "projectID={$project->id}&status=undone"), $project->undoneTasks);?></td>
</tr>
</table>
</div>
module/project/lang/en.php
+1
View File
@@ -189,6 +189,7 @@ $lang->project->myInvolved = 'Involved';
$lang->project->statusSelects[''] = 'More';
$lang->project->statusSelects['wait'] = 'Waiting';
$lang->project->statusSelects['doing'] = 'Doing';
$lang->project->statusSelects['undone'] = 'Unfinished';
$lang->project->statusSelects['finishedbyme'] = 'FinishedByMe';
$lang->project->statusSelects['done'] = 'Done';
$lang->project->statusSelects['closed'] = 'Closed';
module/project/lang/zh-cn.php
+1
View File
@@ -189,6 +189,7 @@ $lang->project->myInvolved = '由我参与';
$lang->project->statusSelects[''] = '更多';
$lang->project->statusSelects['wait'] = '未开始';
$lang->project->statusSelects['doing'] = '进行中';
$lang->project->statusSelects['undone'] = '未完成';
$lang->project->statusSelects['finishedbyme'] = '我完成';
$lang->project->statusSelects['done'] = '已完成';
$lang->project->statusSelects['closed'] = '已关闭';
module/task/model.php
+1 -1
View File
@@ -1652,7 +1652,7 @@ class taskModel extends model
->andWhere("((t4.`account` = '{$this->app->user->account}' AND t4.`type` = 'task') OR t1.`assignedTo` = '{$this->app->user->account}' OR t1.`finishedby` = '{$this->app->user->account}')")
->fi()
->beginIF($productID)->andWhere("((t5.root=" . (int)$productID . " and t5.type='story') OR t2.product=" . (int)$productID . ")")->fi()
->beginIF($type == 'undone')->andWhere("(t1.status = 'wait' or t1.status ='doing')")->fi()
->beginIF($type == 'undone')->andWhere('t1.status')->ne('done')->andWhere('t1.status')->ne('closed')->fi()
->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')