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

Merge branch 'sprint220_zg_61964' into 'master'

Browse Source 
* Code for task#61964

See merge request easycorp/zentaopms!4680
This commit is contained in:
王怡栋
2022-07-27 07:10:24 +00:00
parent 87115957ea 56b4e30328
commit 0fb7686978
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/model.php
+9 -6
View File
@@ -221,13 +221,16 @@ class blockModel extends model
->andWhere('t1.deadline')->ne('0000-00-00')
->andWhere('t1.deadline')->lt($today)
->andWhere('t1.deleted')->eq(0)
->andWhere('t3.deleted')->eq(0)
->fetch('count');
$data['delayBug'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_BUG)
->where('assignedTo')->eq($this->app->user->account)
->andWhere('status')->eq('active')
->andWhere('deadline')->ne('0000-00-00')
->andWhere('deadline')->lt($today)
->andWhere('deleted')->eq(0)
$data['delayBug'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_BUG)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
->where('t1.assignedTo')->eq($this->app->user->account)
->andWhere('t1.status')->eq('active')
->andWhere('t1.deadline')->ne('0000-00-00')
->andWhere('t1.deadline')->lt($today)
->andWhere('t1.deleted')->eq(0)
->andWhere('t2.deleted')->eq(0)
->fetch('count');
$data['delayProject'] = (int)$this->dao->select('count(*) AS count')->from(TABLE_PROJECT)
->where('status')->in('wait,doing')
module/task/model.php
+1 -1
View File
@@ -3625,7 +3625,7 @@ class taskModel extends model
public function printAssignedHtml($task, $users)
{
$btnTextClass = '';
$assignedToText = (!empty($task->team) and $task->mode == 'multi') ? $this->lang->task->team : zget($users, $task->assignedTo);
$assignedToText = (!empty($task->team) and $task->mode == 'multi' and $task->status != 'closed') ? $this->lang->task->team : zget($users, $task->assignedTo);
if(empty($task->assignedTo))
{
module/task/view/view.html.php
+1 -1
View File
@@ -269,7 +269,7 @@
<th><?php echo $lang->task->assignedTo;?></th>
<td>
<?php
if(!empty($task->team) and $task->mode == 'multi')
if(!empty($task->team) and $task->mode == 'multi' and $task->status != 'closed')
{
foreach($task->team as $member) echo ' ' . zget($users, $member->account);
}
module/user/model.php
+2 -1
View File
@@ -2829,7 +2829,8 @@ class userModel extends model
$personalData['createdIssues'] = $this->dao->select($t1Count)->from(TABLE_ISSUE)->alias('t1')->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')->where('t1.createdBy')->eq($account)->andWhere('t1.deleted')->eq('0')->andWhere('t2.deleted')->eq('0')->fetch('count');
$personalData['resolvedIssues'] = $this->dao->select($t1Count)->from(TABLE_ISSUE)->alias('t1')->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')->where('t1.resolvedBy')->eq($account)->andWhere('t1.deleted')->eq('0')->andWhere('t2.deleted')->eq('0')->fetch('count');
}
$personalData['createdDocs'] = $this->dao->select($count)->from(TABLE_DOC)->where('addedBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count');
$allLibs = $this->loadModel('doc')->getLibs('all');
$personalData['createdDocs'] = $this->dao->select($count)->from(TABLE_DOC)->where('addedBy')->eq($account)->andWhere('lib')->in(array_keys($allLibs))->andWhere('deleted')->eq('0')->fetch('count');
$personalData['finishedTasks'] = $this->dao->select($t1Count)->from(TABLE_TASK)->alias('t1')
->leftjoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id')
->where('t1.deleted')->eq('0')