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

* Fix bug #32263.

Browse Source
This commit is contained in:
Yagami
2023-02-23 10:19:19 +08:00
parent 840c89f2e3
commit 290487a68a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/block/control.php
View File

@@ -978,14 +978,14 @@ class block extends control
foreach($projects as $projectID => $project)
{
if($project->model == 'scrum' or $project->model == 'kanban')
if(in_array($project->model, array('scrum', 'kanban', 'agileplus')))
{
$this->app->loadClass('pager', $static = true);
$pager = pager::init(0, 3, 1);
$project->progress = $project->allStories == 0 ? 0 : round($project->doneStories / $project->allStories, 3) * 100;
$project->executions = $this->execution->getStatData($projectID, 'all', 0, 0, false, '', 'id_desc', $pager);
}
elseif($project->model == 'waterfall')
elseif(in_array($project->model, array('waterfall', 'waterfallplus')))
{
$begin = $project->begin;
$weeks = $this->weekly->getWeekPairs($begin);

2
module/block/view/projectstatisticblock.html.php Normal file → Executable file
View File

@@ -134,7 +134,7 @@ $(function()
<?php foreach($projects as $project):?>
<div class="tab-pane fade<?php if($project->id == $selected) echo ' active in';?>" id='<?php echo "tab3{$blockNavId}Content{$project->id}";?>'>
<div class="table-row">
<?php if($project->model == 'scrum' or $project->model == 'kanban'):?>
<?php if(in_array($project->model, array('scrum', 'kanban', 'agileplus'))):?>
<div class='table-row'>
<div class="col-4 text-center">
<div><h4><?php echo $lang->block->storyCount;?></h4></div>