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

* Fix realtime field list.

Browse Source
This commit is contained in:
qixinzhi
2024-04-08 01:22:36 +00:00
parent cb12fed34c
commit 85fd3c78fd
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/model.php
+5 -4
View File
@@ -79,9 +79,8 @@ class metricModel extends model
}
$row->value = is_numeric($record['value']) ? round((float)$record['value'], 2) : $record['value'];
$calcInfo = $this->getRecordCalcInfo($record['id']);
$row->calcType = $calcInfo->calcType;
$row->calculatedBy = !empty($calcInfo->calculatedBy) ? $calcInfo->calculatedBy : 'system';
$row->calcType = $record['calcType'];
$row->calculatedBy = $record['calculatedBy'];
$tableData[] = $row;
}
@@ -723,7 +722,9 @@ class metricModel extends model
$time = helper::now();
foreach($records as $index => $record)
{
$records[$index]['calcTime'] = $time;
$records[$index]['date'] = $time;
$records[$index]['calcType'] = 'cron';
$records[$index]['calculatedBy'] = 'system';
}
return $records;
module/metric/tao.php
+1 -1
View File
@@ -292,7 +292,7 @@ class metricTao extends metricModel
$scopeKey = $metric->scope;
$objectList = $this->getObjectsWithPager($code, $scopeKey, $pager, $scopeValue);
$fieldList = array_merge($fieldList, array('id', 'value', 'date'));
$fieldList = array_merge($fieldList, array('id', 'value', 'date', 'calcType', 'calculatedBy'));
$wrapFields = array_map(fn($value) => "`$value`", $fieldList);
$dataFieldStr = implode(',', $wrapFields);
module/metric/zen.php
+2 -1
View File
@@ -587,13 +587,14 @@ class metricZen extends metric
*/
protected function prepareActionPriv(array $metrics): array
{
$this->loadModel('screen');
foreach($metrics as $metric)
{
$metric->canEdit = $metric->stage == 'wait';
$metric->canImplement = ($metric->stage == 'wait' && !$this->metric->isOldMetric($metric) && $metric->builtin === '0');
$metric->canDelist = $metric->stage == 'released' && $metric->builtin === '0';
$metric->canRecalculate = $metric->stage == 'released' && !empty($metric->dateType) && $metric->dateType != 'nodate';
$metric->isUsed = $this->loadModel('screen')->checkIFChartInUse($metric->id, 'metric');
$metric->isUsed = $this->screen->checkIFChartInUse($metric->id, 'metric');
}
return $metrics;
}