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

Merge remote-tracking branch 'origin/master' into Merge184

Browse Source
This commit is contained in:
tanghucheng
2023-11-22 19:50:16 -05:00
parent 9ab2bb8866 936716a1bf
commit c76efe3019
77 changed files with 1283 additions and 867 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+2 -2
View File
@@ -153,7 +153,7 @@ class execution extends control
$this->app->loadClass('pager', true);
if($this->app->getViewType() == 'mhtml' || $this->app->getViewType() == 'xhtml') $recPerPage = 10;
$pager = new pager($recTotal, $recPerPage, $pageID);
$tasks = $this->execution->getTasks($productID, $executionID, $this->executions, $browseType, $queryID, $moduleID, $sort, $pager);
$tasks = $this->execution->getTasks((int)$productID, $executionID, $this->executions, $browseType, $queryID, (int)$moduleID, $sort, $pager);
/* Build the search form. */
$actionURL = $this->createLink('execution', 'task', "executionID=$executionID&status=bySearch&param=myQueryID");
@@ -764,7 +764,7 @@ class execution extends control
$chartData = $this->execution->buildBurnData($executionID, $dateList, $burnBy, $executionEnd);
$allDateList = date::getDateList($execution->begin, $endDate, 'Y-m-d', $type, $this->config->execution->weekend);
$dayList = array_fill(1, floor(count($allDateList) / $this->config->execution->maxBurnDay) + 5, '');
$dayList = array_fill(1, (int)floor(count($allDateList) / $this->config->execution->maxBurnDay) + 5, '');
foreach($dayList as $key => $val) $dayList[$key] = $this->lang->execution->interval . ($key + 1) . $this->lang->day;
unset($this->lang->TRActions);