Merge branch 'ent-10196-erro-500-al-visualizar-sql-graph-en-informes' into 'develop'
fix custom graph sql pandora_enterprise#10196 See merge request artica/pandorafms!5434
This commit is contained in:
commit
1c86b74271
|
@ -3489,8 +3489,9 @@ function graph_custom_sql_graph(
|
||||||
$data_result = [];
|
$data_result = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = [];
|
$data_bar = [];
|
||||||
$labels = [];
|
$labels_pie = [];
|
||||||
|
$data_pie = [];
|
||||||
$count = 0;
|
$count = 0;
|
||||||
$other = 0;
|
$other = 0;
|
||||||
foreach ($data_result as $data_item) {
|
foreach ($data_result as $data_item) {
|
||||||
|
|
|
@ -154,14 +154,14 @@ function progressbar(
|
||||||
/**
|
/**
|
||||||
* Draw vertical bars graph.
|
* Draw vertical bars graph.
|
||||||
*
|
*
|
||||||
* @param array $chart_data Data chart.
|
* @param array|null $chart_data Data chart.
|
||||||
* @param array $params Params draw chart.
|
* @param array $params Params draw chart.
|
||||||
* @param integer $ttl Pdf option.
|
* @param integer $ttl Pdf option.
|
||||||
*
|
*
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
function vbar_graph(
|
function vbar_graph(
|
||||||
array $chart_data,
|
array|null $chart_data,
|
||||||
array $options
|
array $options
|
||||||
) {
|
) {
|
||||||
if (empty($chart_data) === true) {
|
if (empty($chart_data) === true) {
|
||||||
|
|
Loading…
Reference in New Issue