Issue #2930340 by mpoloskey: Some highcharts settings are not working

modules/charts_highcharts/src/Charts/HighchartsChartsRender.php

@@ -12,9 +12,9 @@ use Drupal\charts_highcharts\Settings\Highcharts\ChartLabel;
 use Drupal\charts_highcharts\Settings\Highcharts\YaxisLabel;
 use Drupal\charts_highcharts\Settings\Highcharts\Yaxis;
 use Drupal\charts_highcharts\Settings\Highcharts\YaxisTitle;
-use Drupal\charts_highcharts\Settings\Highcharts\DataLabelStatus;
-use Drupal\charts_highcharts\Settings\Highcharts\DataLabels;
 use Drupal\charts_highcharts\Settings\Highcharts\PlotOptions;
+use Drupal\charts_highcharts\Settings\Highcharts\PlotOptionsSeries;
+use Drupal\charts_highcharts\Settings\Highcharts\PlotOptionsSeriesDataLabels;
 use Drupal\charts_highcharts\Settings\Highcharts\Tooltip;
 use Drupal\charts_highcharts\Settings\Highcharts\ChartCredits;
 use Drupal\charts_highcharts\Settings\Highcharts\ChartLegend;
@@ -67,14 +67,27 @@ class HighchartsChartsRender implements ChartsRenderInterface {
     // Set chart height.
     if (isset($options['height'])) {
       $chart->setHeight($options['height']);
-    }
+     }
 
     // Set chart title.
     $chartTitle = new ChartTitle();
-    if (isset($options['title'])) {
+    if ((isset($options['title'])) && (!empty($options['title_position']))) {
       $chartTitle->setText($options['title']);
     }
 
+    // Set background color
+    if (isset($options['background'])) {
+    $chart->setBackgroundColor($options['background']);
+    }
+
+    // Set title position.
+    if ($options['title_position'] =='in' ) {
+    $chartTitle->setVerticalAlign('middle');
+    }
+    else {
+    $chartTitle->setVerticalAlign('top');
+    }
+
     $chartXaxis = new Xaxis();
     $chartLabels = new ChartLabel();
 
@@ -124,14 +137,38 @@ class HighchartsChartsRender implements ChartsRenderInterface {
       }
       array_push($yAxes, $chartYaxisSecondary);
     }
-    $dataLabelStatus = new DataLabelStatus();
-    $dataLabels = new DataLabels();
-    $dataLabels->setDataLabels($dataLabelStatus);
+
+    // Set Plotoptions
     $plotOptions = new PlotOptions();
-    $plotOptions->setPlotType($dataLabels);
+    $plotOptionsSeries = new PlotOptionsSeries();
+    $plotOptionsSeriesDataLabels = new PlotOptionsSeriesDataLabels();
+    $plotOptions->setPlotSeries($plotOptionsSeries);
+    $plotOptionsSeries->setDataLabels($plotOptionsSeriesDataLabels);
+    $plotOptionsSeriesDataLabels->setEnabled($options['data_labels']);
+
+    // Set Tooltip
     $chartTooltip = new Tooltip();
+    $chartTooltip->setEnabled($options['tooltips']);
     $chartCredits = new ChartCredits();
+
+    // Set charts legend
     $chartLegend = new ChartLegend();
+    if (empty($options['legend_position'])) {
+    $chartLegend->setEnabled(false);
+    }
+    elseif (in_array($options['legend_position'], array('left','right'))) {
+    $chartLegend->setAlign($options['legend_position']);
+    $chartLegend->setVerticalAlign('top');
+      if ($options['legend_position'] == 'left') {
+     $chartLegend->setX('0');
+     }
+    }
+    else {
+    $chartLegend->setVerticalAlign($options['legend_position']);
+    $chartLegend->setAlign('center');
+    $chartLegend->setX('0');
+    $chartLegend->setY('0');
+    }
 
     $highchart = new Highcharts();
     $highchart->setChart($chart);
@@ -143,7 +180,6 @@ class HighchartsChartsRender implements ChartsRenderInterface {
     $highchart->setCredits($chartCredits);
     $highchart->setLegend($chartLegend);
     $highchart->setSeries($seriesData);
-
     $variables['chart_type'] = 'highcharts';
     $variables['content_attributes']['data-chart'][] = json_encode($highchart);
     $variables['attributes']['id'][0] = $chartId;

modules/charts_highcharts/src/Plugin/chart/Highchart.php

@@ -13,9 +13,9 @@ use Drupal\charts_highcharts\Settings\Highcharts\ChartLabel;
 use Drupal\charts_highcharts\Settings\Highcharts\YaxisLabel;
 use Drupal\charts_highcharts\Settings\Highcharts\Yaxis;
 use Drupal\charts_highcharts\Settings\Highcharts\YaxisTitle;
-use Drupal\charts_highcharts\Settings\Highcharts\DataLabelStatus;
-use Drupal\charts_highcharts\Settings\Highcharts\DataLabels;
 use Drupal\charts_highcharts\Settings\Highcharts\PlotOptions;
+use Drupal\charts_highcharts\Settings\Highcharts\PlotOptionsSeries;
+use Drupal\charts_highcharts\Settings\Highcharts\PlotOptionsSeriesDataLabels;
 use Drupal\charts_highcharts\Settings\Highcharts\Tooltip;
 use Drupal\charts_highcharts\Settings\Highcharts\ChartCredits;
 use Drupal\charts_highcharts\Settings\Highcharts\ChartLegend;
@@ -46,6 +46,8 @@ class Highchart extends AbstractChart {
    *   Variables.
    * @param mixed $chartId
    *   Chart Id.
+   *
+   * @return array|void
    */
   public function buildVariables($options, $categories = [], $seriesData = [], $attachmentDisplayOptions = [], &$variables, $chartId) {
     $noAttachmentDisplays = count($attachmentDisplayOptions) === 0;
@@ -61,10 +63,12 @@ class Highchart extends AbstractChart {
       }
       // Add innerSize to differentiate between donut and pie.
       foreach ($seriesData as $key => &$value) {
-        $innerSize['showInLegend'] = 'true';
-        $innerSize['innerSize'] = '40%';
-        $chartPlacement = array_search($value, $seriesData);
-        $seriesData[$chartPlacement] = array_merge($innerSize, $seriesData[$chartPlacement]);
+        if ($typeOptions == 'pie') {
+          $innerSize['showInLegend'] = 'true';
+          $innerSize['innerSize'] = '40%';
+          $chartPlacement = array_search($value, $seriesData);
+          $seriesData[$chartPlacement] = array_merge($innerSize, $seriesData[$chartPlacement]);
+        }
       }
     }
     $chart->setType($typeOptions);
@@ -81,10 +85,23 @@ class Highchart extends AbstractChart {
 
     // Set chart title.
     $chartTitle = new ChartTitle();
-    if (isset($options['title'])) {
+    if ((isset($options['title'])) && (!empty($options['title_position']))) {
       $chartTitle->setText($options['title']);
     }
 
+    // Set background color
+    if (isset($options['background'])) {
+      $chart->setBackgroundColor($options['background']);
+    }
+
+    // Set title position.
+    if ($options['title_position'] =='in' ) {
+      $chartTitle->setVerticalAlign('middle');
+    }
+    else {
+      $chartTitle->setVerticalAlign('top');
+    }
+
     $chartXaxis = new Xaxis();
     $chartLabels = new ChartLabel();
 
@@ -134,14 +151,38 @@ class Highchart extends AbstractChart {
       }
       array_push($yAxes, $chartYaxisSecondary);
     }
-    $dataLabelStatus = new DataLabelStatus();
-    $dataLabels = new DataLabels();
-    $dataLabels->setDataLabels($dataLabelStatus);
+
+    // Set Plotoptions
     $plotOptions = new PlotOptions();
-    $plotOptions->setPlotType($dataLabels);
+    $plotOptionsSeries = new PlotOptionsSeries();
+    $plotOptionsSeriesDataLabels = new PlotOptionsSeriesDataLabels();
+    $plotOptions->setPlotSeries($plotOptionsSeries);
+    $plotOptionsSeries->setDataLabels($plotOptionsSeriesDataLabels);
+    $plotOptionsSeriesDataLabels->setEnabled($options['data_labels']);
+
+    // Set Tooltip
     $chartTooltip = new Tooltip();
+    $chartTooltip->setEnabled($options['tooltips']);
     $chartCredits = new ChartCredits();
+
+    // Set charts legend
     $chartLegend = new ChartLegend();
+    if (empty($options['legend_position'])) {
+      $chartLegend->setEnabled(false);
+    }
+    elseif (in_array($options['legend_position'], array('left','right'))) {
+      $chartLegend->setAlign($options['legend_position']);
+      $chartLegend->setVerticalAlign('top');
+      if ($options['legend_position'] == 'left') {
+        $chartLegend->setX('0');
+      }
+    }
+    else {
+      $chartLegend->setVerticalAlign($options['legend_position']);
+      $chartLegend->setAlign('center');
+      $chartLegend->setX('0');
+      $chartLegend->setY('0');
+    }
 
     $highchart = new Highcharts();
     $highchart->setChart($chart);
@@ -153,7 +194,6 @@ class Highchart extends AbstractChart {
     $highchart->setCredits($chartCredits);
     $highchart->setLegend($chartLegend);
     $highchart->setSeries($seriesData);
-
     $variables['chart_type'] = 'highcharts';
     $variables['content_attributes']['data-chart'][] = json_encode($highchart);
     $variables['attributes']['id'][0] = $chartId;

modules/charts_highcharts/src/Settings/Highcharts/Chart.php

@@ -10,6 +10,7 @@ class Chart implements \JsonSerializable {
   private $type;
   private $width = NULL;
   private $height = NULL;
+  private $backgroundColor;
 
   /**
    * Get Type.
@@ -81,6 +82,26 @@ class Chart implements \JsonSerializable {
     }
   }
 
+   /**
+   * Get BackgroundColor
+   *
+   * @return string
+   *   BackgroundColor
+   */
+  public function getBackgroundColor() {
+    return $this->backgroundColor;
+  }
+
+  /**
+   * Set BackgroundColor
+   *
+   * @param string $BackgroundColor
+   *   BackgroundColor
+   */
+  public function setBackgroundColor($backgroundColor) {
+     $this->backgroundColor = $backgroundColor;
+  }
+
   /**
    * Json Serialize.
    *

modules/charts_highcharts/src/Settings/Highcharts/ChartLegend.php

@@ -10,7 +10,7 @@ class ChartLegend implements \JsonSerializable {
   private $layout = 'vertical';
   private $align = 'right';
   private $verticalAlign = 'top';
-  private $x = -40;
+  private $x = 0;
   private $y = 80;
   private $floating = TRUE;
   private $borderWidth = 1;
@@ -196,6 +196,27 @@ class ChartLegend implements \JsonSerializable {
   public function setShadow($shadow) {
     $this->shadow = $shadow;
   }
+  
+  /**
+   * Set Legende.
+   *
+   * @return boolean
+   *   Enabled 
+   */
+ public function isEnabled() {
+    return $this->enabled;
+  }
+
+  /**
+   * Set enabled
+   * 
+   * @param boolean $enabled
+   *   Enabled
+   */
+ 
+  public function setEnabled($enabled) {
+    $this->enabled = $enabled;
+  }
 
   /**
    * Json Serialize.

modules/charts_highcharts/src/Settings/Highcharts/ChartTitle.php

@@ -28,6 +28,21 @@ class ChartTitle implements \JsonSerializable {
   public function setText($text) {
     $this->text = $text;
   }
+ 
+  /**
+   * @return string
+   */
+  public function getVerticalAlign() {
+    return $this->verticalAlign;
+  }
+
+  /**
+   * @param string $verticalAlign
+   */
+  public function setVerticalAlign($verticalAlign) {
+    $this->verticalAlign = $verticalAlign;
+  }
+
 
   /**
    * Json Serialize.

modules/charts_highcharts/src/Settings/Highcharts/PlotOptions.php

@@ -2,38 +2,25 @@
 
 namespace Drupal\charts_highcharts\Settings\Highcharts;
 
-/**
- * Plot Options.
- */
 class PlotOptions implements \JsonSerializable {
-
-  private $plotType;
+  private $series;
 
   /**
-   * Get Plot Type.
-   *
    * @return mixed
-   *   Plot Type.
    */
-  public function getPlotType() {
-    return $this->plotType;
+  public function getPlotSeries() {
+    return $this->series;
   }
 
   /**
-   * Set Plot Type.
-   *
    * @param mixed $plotType
-   *   Plot Type.
    */
-  public function setPlotType($plotType) {
-    $this->plotType = $plotType;
+  public function setPlotSeries($series) {
+    $this->series = $series;
   }
 
   /**
-   * Json Serialize.
-   *
    * @return array
-   *   Json Serialize.
    */
   public function jsonSerialize() {
     $vars = get_object_vars($this);

modules/charts_highcharts/src/Settings/Highcharts/DataLabels.php → modules/charts_highcharts/src/Settings/Highcharts/PlotOptionsSeries.php

@@ -2,38 +2,25 @@
 
 namespace Drupal\charts_highcharts\Settings\Highcharts;
 
-/**
- * Data Labels.
- */
-class DataLabels implements \JsonSerializable {
-
+class PlotOptionsSeries implements \JsonSerializable {
   private $dataLabels;
 
   /**
-   * Get Data Labels.
-   *
    * @return mixed
-   *   Data Labels.
    */
   public function getDataLabels() {
     return $this->dataLabels;
   }
 
   /**
-   * Set Data Labels.
-   *
    * @param mixed $dataLabels
-   *   Data Labels.
    */
   public function setDataLabels($dataLabels) {
     $this->dataLabels = $dataLabels;
   }
 
   /**
-   * Json Serialize.
-   *
    * @return array
-   *   Json Serialize.
    */
   public function jsonSerialize() {
     $vars = get_object_vars($this);

modules/charts_highcharts/src/Settings/Highcharts/PlotOptionsSeriesDataLabels.php

+<?php
+
+namespace Drupal\charts_highcharts\Settings\Highcharts;
+
+class PlotOptionsSeriesDataLabels implements \JsonSerializable {
+  private $enabled = FALSE;
+
+  /**
+   * @return boolean
+   */
+  public function getEnabled() {
+    return $this->enabled;
+  }
+
+  /**
+   * @param boolean $enabled
+   */
+  public function setEnabled($enabled) {
+    $this->enabled = $enabled;
+  }
+
+  /**
+   * @return array
+   */
+  public function jsonSerialize() {
+    $vars = get_object_vars($this);
+
+    return $vars;
+  }
+
+}

modules/charts_highcharts/src/Settings/Highcharts/Tooltip.php

@@ -8,6 +8,7 @@ namespace Drupal\charts_highcharts\Settings\Highcharts;
 class Tooltip implements \JsonSerializable {
 
   private $valueSuffix = '';
+  private $enabled = FALSE; 
 
   /**
    * Get Value Suffix.
@@ -28,7 +29,21 @@ class Tooltip implements \JsonSerializable {
   public function setValueSuffix($valueSuffix) {
     $this->valueSuffix = $valueSuffix;
   }
+  
+  /**
+   * @return boolean
+   */
+  public function getEnabled() {
+    return $this->enabled;
+  }
 
+  /**
+   * @param boolean $enabled
+   */
+  public function setEnabled($enabled) {
+    $this->enabled = $enabled;
+  }
+  
   /**
    * Json Serialize.
    *