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

* Support sum for bar chart.

Browse Source
This commit is contained in:
zhujinyong
2022-12-26 16:08:46 +08:00
parent 5c2da929f6
commit 4498447a19
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/screen/model.php
+30 -10
View File
@@ -104,6 +104,7 @@ class screenModel extends model
$config->previewScaleType = 'scrollY';
$componentList = json_decode($screen->scheme);
$componentList = json_decode(file_get_contents('/home/zhu/zcorp/screen/' . $screen->id . '.json'));
if(empty($componentList)) $componentList = array();
/* Reset height of canvas. */
@@ -544,22 +545,38 @@ class screenModel extends model
$sql = $this->setFilterSQL($chart);
$results = $this->dao->query($sql)->fetchAll();
foreach($results as $result)
{
$key = $settings->xaxis[0]->name;
$field = $settings->xaxis[0]->field;
$row = array($key => $result->$field);
foreach($settings->yaxis as $yaxis)
if($settings->yaxis[0]->agg == 'sum')
{
$field = $yaxis->field;
$row[$yaxis->name] = $result->$field;
if(!isset($sourceData[$result->$field])) $sourceData[$result->$field] = array($key => $result->$field);
foreach($settings->yaxis as $yaxis)
{
$valueField = $yaxis->field;
if(!isset($sourceData[$result->$field][$yaxis->name])) $sourceData[$result->$field][$yaxis->name] = 0;
$sourceData[$result->$field][$yaxis->name] += $result->$valueField;
}
}
else
{
$row = array($key => $result->$field);
foreach($settings->yaxis as $yaxis)
{
$field = $yaxis->field;
$row[$yaxis->name] = $result->$field;
}
$sourceData[] = $row;
}
$sourceData[] = $row;
}
$component->option->dataset->dimensions = $dimensions;
$component->option->dataset->source = $sourceData;
$component->option->dataset->source = array_values($sourceData);
}
}
@@ -665,17 +682,20 @@ class screenModel extends model
$metrics[$metric->key] = array('field' => $metric->field, 'name' => $metric->name, 'value' => 0);
}
$max = 0;
foreach($results as $result)
{
if(isset($metrics[$result->$group]))
{
$field = $metrics[$result->$group]['field'];
$metrics[$result->$group]['value'] = $result->$field;
if($max < $result->$field) $max = $result->$field;
$metrics[$result->$group]['value'] += $result->$field;
}
}
$max = 0;
foreach($metrics as $data)
{
if($data['value'] > $max) $max = $data['value'];
}
$data = array('name' => '', 'value' => array());
$value = array();