diff --git a/modules/charts_c3/.gitignore b/modules/charts_c3/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..4f4acd356ffd7eabb0eec871e7edb678ffe6f6b0 --- /dev/null +++ b/modules/charts_c3/.gitignore @@ -0,0 +1,2 @@ +vendor/ +composer.lock \ No newline at end of file diff --git a/modules/charts_c3/src/Charts/C3ChartsRender.php b/modules/charts_c3/src/Charts/C3ChartsRender.php index e14c9057bde76dc88d60a20230d6c001ccd89e3a..992c50cd662b94f301f470779ff138077384c52a 100644 --- a/modules/charts_c3/src/Charts/C3ChartsRender.php +++ b/modules/charts_c3/src/Charts/C3ChartsRender.php @@ -30,7 +30,7 @@ class C3ChartsRender implements ChartsRenderInterface { $noAttachmentDisplays = count($attachmentDisplayOptions) === 0; $yAxis = []; $types = []; - //sets secondary axis from the first attachment only + // Sets secondary axis from the first attachment only. if (!$noAttachmentDisplays && $attachmentDisplayOptions[0]['inherit_yaxis'] == 0) { $yAxis[$seriesData[1]['name']] = 'y2'; } diff --git a/modules/charts_google/.gitignore b/modules/charts_google/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..4f4acd356ffd7eabb0eec871e7edb678ffe6f6b0 --- /dev/null +++ b/modules/charts_google/.gitignore @@ -0,0 +1,2 @@ +vendor/ +composer.lock \ No newline at end of file diff --git a/modules/charts_google/src/Charts/GoogleChartsRender.php b/modules/charts_google/src/Charts/GoogleChartsRender.php index a707daeda25fe4bafee43c1ebb57e248a7f4682e..6f4e5a7d4373c174939af5a970ea3343c8962c2e 100644 --- a/modules/charts_google/src/Charts/GoogleChartsRender.php +++ b/modules/charts_google/src/Charts/GoogleChartsRender.php @@ -59,6 +59,7 @@ class GoogleChartsRender implements ChartsRenderInterface { * @return GoogleOptions object with chart options or settings to be used by google visualization framework */ private function charts_google_create_charts_options($options, $seriesData = [], $attachmentDisplayOptions = []) { + $noAttachmentDisplays = count($attachmentDisplayOptions) === 0; $chartSelected = []; $seriesTypes = []; $firstVaxis = ['minValue' => 0, 'title' => $options['yaxis_title']]; @@ -66,7 +67,7 @@ class GoogleChartsRender implements ChartsRenderInterface { $vAxes = []; array_push($vAxes, $firstVaxis); //sets secondary axis from the first attachment only - if ($attachmentDisplayOptions[0]['inherit_yaxis'] == 0) { + if (!$noAttachmentDisplays && $attachmentDisplayOptions[0]['inherit_yaxis'] == 0) { $secondVaxis['title'] = $attachmentDisplayOptions[0]['style']['options']['yaxis_title']; array_push($vAxes, $secondVaxis); } diff --git a/modules/charts_highcharts/.gitignore b/modules/charts_highcharts/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..4f4acd356ffd7eabb0eec871e7edb678ffe6f6b0 --- /dev/null +++ b/modules/charts_highcharts/.gitignore @@ -0,0 +1,2 @@ +vendor/ +composer.lock \ No newline at end of file