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

* Fix recalculate metriclib.

Browse Source
This commit is contained in:
zhouxin
2024-06-02 17:21:03 +08:00
parent 4d4cdfd1ac
commit 4a25481663
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/control.php
+4 -3
View File
@@ -164,17 +164,18 @@ class metric extends control
*
* @param string $code
* @param string $date
* @param string $calcType
* @access public
* @return void
*/
public function ajaxUpdateSingleMetricLib($code, $date)
public function ajaxUpdateSingleMetricLib($code, $date, $calcType)
{
$date = str_replace('_', '-', $date);
$dateType = $this->metric->getDateTypeByCode($code);
$isCalcByCron = $this->metric->isCalcByCron($code, $date, $dateType);
if($calcType == 'inference') $isCalcByCron = $this->metric->isCalcByCron($code, $date, $dateType);
if(!$isCalcByCron)
if($calcType == 'all' || !$isCalcByCron)
{
$calc = $this->metric->calculateMetricByCode($code);
$record = $this->metricZen->getRecordByCodeAndDate($code, $calc, $date);
module/metric/js/recalculate.ui.js
+1 -1
View File
@@ -61,7 +61,7 @@ function recalculateSingle(code, dateType, startDate, endDate)
var date = dateToString(dateRange[index]);
var $html = recalculateLog(date);
var link = $.createLink('metric', 'ajaxUpdateSingleMetricLib', 'code=' + code + '&date=' + date);
var link = $.createLink('metric', 'ajaxUpdateSingleMetricLib', 'code=' + code + '&date=' + date + '&calcType=' + calcType);
$.get(link, function(result){
$('.recalculate-log').append($html);
updateSingleHistory(dateRange, index + 1);