From 25b62829626fe26ec92901a4917d4b87005ba57b Mon Sep 17 00:00:00 2001
From: Daniel Cothran <daniel@andile.co>
Date: Thu, 27 Jul 2017 00:29:07 -0400
Subject: [PATCH] Add Donut chart type in config form and small changes
brushing up for DrupalGovCon2017 sprint.
---
modules/charts_c3/.gitignore | 2 ++
modules/charts_c3/src/Charts/C3ChartsRender.php | 2 +-
modules/charts_google/.gitignore | 2 ++
modules/charts_google/src/Charts/GoogleChartsRender.php | 3 ++-
modules/charts_highcharts/.gitignore | 2 ++
5 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 modules/charts_c3/.gitignore
create mode 100644 modules/charts_google/.gitignore
create mode 100644 modules/charts_highcharts/.gitignore
diff --git a/modules/charts_c3/.gitignore b/modules/charts_c3/.gitignore
new file mode 100644
index 0000000..4f4acd3
--- /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 e14c905..992c50c 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 0000000..4f4acd3
--- /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 a707dae..6f4e5a7 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 0000000..4f4acd3
--- /dev/null
+++ b/modules/charts_highcharts/.gitignore
@@ -0,0 +1,2 @@
+vendor/
+composer.lock
\ No newline at end of file
--
GitLab