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

* Finish task #43998.

Browse Source
This commit is contained in:
孙广明
2021-11-10 09:43:04 +08:00
parent f13d696912
commit 6d625bb597
2 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+23 -2
View File
@@ -1945,8 +1945,29 @@ class execution extends control
/* Max 2 closed executions. */
if($status == 'closed')
{
if(isset($myExecutions[$status]) and count($myExecutions[$status]) >= 2) $myExecutions[$status] = array_slice($myExecutions[$status], 0, 2, true);
if(isset($kanbanGroup[$projectID][$status]) and count($kanbanGroup[$projectID][$status]) >= 2) $kanbanGroup[$projectID][$status] = array_slice($kanbanGroup[$projectID][$status], 0, 2, true);
if(isset($myExecutions[$status]) and count($myExecutions[$status]) > 2)
{
foreach($myExecutions[$status] as $executionID => $execution)
{
unset($myExecutions[$status][$executionID]);
$myExecutions[$status][$execution->closedDate] = $execution;
}
krsort($myExecutions[$status]);
$myExecutions[$status] = array_slice($myExecutions[$status], 0, 2, true);
}
if(isset($kanbanGroup[$projectID][$status]) and count($kanbanGroup[$projectID][$status]) > 2)
{
foreach($kanbanGroup[$projectID][$status] as $executionID => $execution)
{
unset($kanbanGroup[$projectID][$status][$executionID]);
$kanbanGroup[$projectID][$status][$execution->closedDate] = $execution;
}
krsort($kanbanGroup[$projectID][$status]);
$kanbanGroup[$projectID][$status] = array_slice($kanbanGroup[$projectID][$status], 0, 2);
}
}
}
module/project/model.php
+20 -3
View File
@@ -1857,7 +1857,7 @@ class projectModel extends model
$myProjects = array();
$otherProjects = array();
$closedCount = 0;
$closedGroup = array();
foreach($projects as $project)
{
if(strpos('wait,doing,closed', $project->status) === false) continue;
@@ -1873,7 +1873,7 @@ class projectModel extends model
}
else
{
if(!isset($myProjects[$topProgram][$project->status]) or count($myProjects[$topProgram][$project->status]) < 2) $myProjects[$topProgram][$project->status][] = $project;
$closedGroup['my'][$topProgram][$project->closedDate] = $project;
}
}
else
@@ -1884,7 +1884,24 @@ class projectModel extends model
}
else
{
if(!isset($otherProjects[$topProgram][$project->status]) or count($otherProjects[$topProgram][$project->status]) < 2) $otherProjects[$topProgram][$project->status][] = $project;
$closedGroup['other'][$topProgram][$project->closedDate] = $project;
}
}
}
/* Only display recent two closed projects. */
foreach($closedGroup as $group => $closedProjects)
{
foreach($closedProjects as $topProgram => $projects)
{
krsort($projects);
if($group == 'my')
{
$myProjects[$topProgram]['closed'] = array_slice($projects, 0, 2);
}
else
{
$otherProjects[$topProgram]['closed'] = array_slice($projects, 0, 2);
}
}
}