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

* Code for task#86981.

Browse Source
This commit is contained in:
xieqiyu
2023-03-23 06:16:48 +00:00
parent fe2c72be75
commit 3412fe2fad
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/model.php
+13 -1
View File
@@ -8513,9 +8513,14 @@ class upgradeModel extends model
*/
public function processChart()
{
$charts = $this->dao->select('*')->from(TABLE_CHART)->fetchAll();
$charts = $this->dao->select('*')->from(TABLE_CHART)->fetchAll('id');
$dashboardLayoutPairs = $this->dao->select('id, layout')->from(TABLE_DASHBOARD)->fetchPairs();
$dataviewList = $this->dao->select('t1.code,t1.sql,t1.fields')->from(TABLE_DATAVIEW)->alias('t1')
->leftJoin(TABLE_CHART)->alias('t2')->on('t1.code = t2.dataset')
->where('t2.id')->in(array_keys($charts))
->fetchAll('code');
$defaultGroupID = $this->createDefaultGroup('chart');
$data = new stdclass();
@@ -8538,6 +8543,13 @@ class upgradeModel extends model
$data->settings = json_encode($settings);
$data->filters = json_encode($filters);
if(isset($dataviewList[$chart->dataset]))
{
$dataview = $dataviewList[$chart->dataset];
$data->sql = isset($dataview->sql) ? $dataview->sql : '';
$data->fields = isset($dataview->fields) ? $dataview->fields : '';
}
if($chart->type == 'table')
{
$pivotID = $this->upgradeToPivotTable($chart);