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

* Fix bug for task #61973.

Browse Source
This commit is contained in:
liumengyi
2022-07-26 10:27:08 +08:00
parent 865986c216
commit b67950c1ba
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/execution/control.php
View File

@@ -2295,10 +2295,13 @@ class execution extends control
$this->app->loadClass('date');
$begin = date('Y-m-d', strtotime('-13 days'));
$begin = (helper::isZeroDate($execution->begin) or helper::diffDate($execution->begin, $begin) >= 14) ? $begin : $execution->begin;
$begin = (helper::isZeroDate($execution->begin) or helper::diffDate($begin, $execution->begin) > 0) ? $begin : $execution->begin;
$end = helper::today();
$dateList = date::getDateList($begin, $end, 'Y-m-d', 'noweekend');
$chartData = $this->execution->buildCFDData($executionID, $dateList, 'task');
$this->view->begin = helper::safe64Encode(urlencode($begin));
$this->view->end = helper::safe64Encode(urlencode($end));
}
else
{

7
module/execution/view/view.html.php
View File

@@ -157,7 +157,7 @@
<div class="panel-title"><?php echo $execution->name . $lang->execution->CFD;?></div>
<?php if(common::hasPriv('execution', 'cfd')):?>
<nav class="panel-actions nav nav-default">
<li><?php common::printLink('execution', 'cfd', "executionID=$execution->id", '<i class="icon icon-more icon-sm"></i>', '', "title=$lang->more");?></li>
<li><?php common::printLink('execution', 'cfd', "executionID=$execution->id&type=task&withWeekend=false&begin=$begin&end=$end", '<i class="icon icon-more icon-sm"></i>', '', "title=$lang->more");?></li>
</nav>
<?php endif;?>
</div>
@@ -226,11 +226,6 @@
<div class="panel block-dynamic" style="height: 280px">
<div class="panel-heading">
<div class="panel-title"><?php echo $lang->execution->latestDynamic;?></div>
<?php if(common::hasPriv('execution', 'dynamic')):?>
<nav class="panel-actions nav nav-default">
<li><?php common::printLink('execution', 'dynamic', "executionID=$execution->id&type=all", '<i class="icon icon-more icon-sm"></i>', '', "title=$lang->more");?></li>
</nav>
<?php endif;?>
</div>
<div class="panel-body scrollbar-hover">
<ul class="timeline timeline-tag-left no-margin">