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

* Finish task #60641.

Browse Source
This commit is contained in:
mayue
2022-07-11 15:26:14 +08:00
parent 5446bcf1f4
commit ea0500a20c
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+3 -2
View File
@@ -1365,7 +1365,7 @@ class execution extends control
* @access public
* @return void
*/
public function cfd($executionID = 0, $type = 'story')
public function cfd($executionID = 0, $type = 'story', $withWeekend = 'false')
{
$execution = $this->commonAction($executionID);
$executionID = $execution->id;
@@ -1374,7 +1374,7 @@ class execution extends control
$this->app->loadClass('date');
list($begin, $end) = $this->execution->getBeginEnd4CFD($execution);
$dateList = date::getDateList($begin, $end, 'Y-m-d', '');
$dateList = date::getDateList($begin, $end, 'Y-m-d', $withWeekend == 'false'? 'noweekend' : '');
//list($cycleTimeAvg, $throughput) = $this->execution->getCFDStatistics($executionID, $dateList, $type);
@@ -1384,6 +1384,7 @@ class execution extends control
$this->view->title = $this->lang->execution->CFD;
$this->view->type = $type;
$this->view->execution = $execution;
$this->view->withWeekend = $withWeekend;
$this->view->executionName = $execution->name;
$this->view->executionID = $executionID;
$this->view->chartData = $chartData;
module/execution/js/cfd.js
+7
View File
@@ -127,4 +127,11 @@ $(function()
{
location.href = createLink('execution', 'cfd', 'executionID=' + executionID + '&type=' + $(this).val());
});
$('#weekend').click(function()
{
var type = $('#type').val();
withWeekend = withWeekend == 'true' ? 'false' : 'true';
location.href = createLink('execution', 'cfd', 'executionID=' + executionID + '&type=' + type + '&withWeekend=' + withWeekend);
});
});
module/execution/view/cfd.html.php
+3
View File
@@ -14,6 +14,7 @@
<?php js::import($jsRoot . 'echarts/echarts.common.min.js'); ?>
<?php js::import($jsRoot . 'html2canvas/min.js'); ?>
<?php js::set('executionID', $executionID); ?>
<?php js::set('withWeekend', $withWeekend); ?>
<?php js::set('chartData', $chartData); ?>
<?php js::set('YUnit', $lang->execution->count); ?>
<?php js::set('XUnit', $lang->execution->burnXUnit); ?>
@@ -25,6 +26,8 @@
common::printLink('execution', 'computeCFD', "reload=yes&executionID=$executionID", '<i class="icon icon-refresh"></i> ' . $lang->execution->computeCFD, 'hiddenwin', "title='{$lang->execution->computeCFD}' class='btn btn-primary' id='computeCFD'");
echo '<div class="space"></div>';
}
$weekend = $withWeekend == 'true' ? 'noweekend' : 'withweekend';
echo html::a('#', $lang->execution->$weekend, '', "class='btn btn-link' id='weekend'");
?>
<div class='input-control w-100px'>
<?php echo html::select('type', $lang->execution->cfdTypeList, $type, "class='form-control chosen'");?>