Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x

This commit is contained in:
z
2020-08-24 10:19:56 +08:00
24 changed files with 574 additions and 256 deletions
+3 -7
View File
@@ -53,18 +53,14 @@ class program extends control
if($programType === 'bygrid')
{
$projectList = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, 0, 0, 30, $orderBy, $pager, 'program');
foreach($projectList as $projectID => $project)
{
$project->teamCount = count($this->project->getTeamMembers($project->id));
}
$programs = $this->program->getProgramStats('all', 20, $orderBy, $pager);
}
else
{
$projectList = $this->program->getList($status, $orderBy, $pager);
$programs = $this->program->getList($status, $orderBy, $pager);
}
$this->view->projectList = $projectList;
$this->view->programs = $programs;
$this->view->status = $status;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;