From c9df9f99884f2e42e946ceb6e59fad7f1265d262 Mon Sep 17 00:00:00 2001
From: andileco <daniel@andile.co>
Date: Thu, 18 May 2017 12:03:55 -0400
Subject: [PATCH] Fixes: 2879174 and 2879294. Also improves a bug to C3 and
Google that made it so that attachments were displaying the wrong chart type.
---
charts.module | 2 --
modules/charts_c3/src/Charts/C3ChartsRender.php | 15 ++++++---------
.../src/Charts/GoogleChartsRender.php | 5 +++--
src/Plugin/views/style/ChartsPluginStyleChart.php | 6 +++---
src/Util/Util.php | 11 ++++++++---
5 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/charts.module b/charts.module
index ea293d0..da19805 100644
--- a/charts.module
+++ b/charts.module
@@ -56,7 +56,6 @@ function template_preprocess_views_view_charts(&$variables) {
$labelField = $attachmentView[$i]->style_plugin->options['label_field'];
$dataAttachment = Util::viewsData($attachmentView[$i], $combinedAttachmentPage, $labelField, $attachmentColor, $attachmentChartTypeOption[$i]);
$dataAttachmentFormatted = Util::createChartableData($dataAttachment);
-
for ($j = 0; $j < count($dataAttachmentFormatted[0]); $j++) {
array_push($categoriesAttachment, $dataAttachmentFormatted[0][$j]);
}
@@ -90,7 +89,6 @@ function template_preprocess_views_view_charts(&$variables) {
$attachmentDisplayOptions[$i] = $attachmentDisplay['display_options'];
}
$seriesData = array_merge($seriesData, $seriesDataAttachment);
-
$moduleSelector = new ModuleSelector($library, $categories, $seriesData, $options, $attachmentDisplayOptions, $variables, $chartId);
}
diff --git a/modules/charts_c3/src/Charts/C3ChartsRender.php b/modules/charts_c3/src/Charts/C3ChartsRender.php
index d1a46f5..c89cd31 100644
--- a/modules/charts_c3/src/Charts/C3ChartsRender.php
+++ b/modules/charts_c3/src/Charts/C3ChartsRender.php
@@ -27,20 +27,19 @@ class C3ChartsRender implements ChartsRenderInterface {
* @return CThree
*/
public function charts_render_charts($options, $categories = [], $seriesData = [], $attachmentDisplayOptions = [], &$variables, $chartId) {
-
- $noAttachmentDisplays = count($attachmentDisplayOptions);
+ $noAttachmentDisplays = count($attachmentDisplayOptions) === 0;
$yAxis = [];
$types = [];
//sets secondary axis from the first attachment only
- if ($attachmentDisplayOptions[0]['inherit_yaxis'] == 0) {
+ if (!$noAttachmentDisplays && $attachmentDisplayOptions[0]['inherit_yaxis'] == 0) {
$yAxis[$seriesData[1]['name']] = 'y2';
}
-
+ // @todo - make this work for more that one attachment.
for ($i = 1; $i <= count($attachmentDisplayOptions); $i++) {
if ($attachmentDisplayOptions[$i - 1]['style']['options']['type'] == 'column')
- $types[$seriesData[$i]['name']] = 'bar';
+ $types[$seriesData[$i + 1]['name']] = 'bar';
else
- $types[$seriesData[$i]['name']] = $attachmentDisplayOptions[$i - 1]['style']['options']['type'];
+ $types[$seriesData[$i + 1]['name']] = $attachmentDisplayOptions[$i - 1]['style']['options']['type'];
}
$c3Data = [];
for ($i = 0; $i < count($seriesData); $i++) {
@@ -57,14 +56,12 @@ class C3ChartsRender implements ChartsRenderInterface {
$c3 = new CThree();
$bindTo = '#' . $chartId;
$c3->setBindTo($bindTo);
- //$c3->setChart($c3Chart);
- //$c3->setLabels($options['data_labels']);
$c3->setTitle($c3ChartTitle);
$chartData = new ChartData();
if ($noAttachmentDisplays > 0) {
$chartData->setLabels(FALSE);
}
- if ($attachmentDisplayOptions[0]['inherit_yaxis'] == 0) {
+ if (!$noAttachmentDisplays && $attachmentDisplayOptions[0]['inherit_yaxis'] == 0) {
$chartData->axes = $yAxis;
$showSecAxis['show'] = true;
$showSecAxis['label'] = $attachmentDisplayOptions[0]['style']['options']['yaxis_title'];
diff --git a/modules/charts_google/src/Charts/GoogleChartsRender.php b/modules/charts_google/src/Charts/GoogleChartsRender.php
index f67527e..df6a0c9 100644
--- a/modules/charts_google/src/Charts/GoogleChartsRender.php
+++ b/modules/charts_google/src/Charts/GoogleChartsRender.php
@@ -71,14 +71,15 @@ class GoogleChartsRender implements ChartsRenderInterface {
array_push($vAxes, $secondVaxis);
}
array_push($chartSelected, $options['type']);
+ // @todo: make sure this works for more than one attachment.
for ($i = 0; $i < count($attachmentDisplayOptions); $i++) {
$attachmentChartType = $attachmentDisplayOptions[$i]['style']['options']['type'];
if ($attachmentChartType == 'column')
$attachmentChartType = 'bars';
if ($attachmentDisplayOptions[0]['inherit_yaxis'] == 0 && $i == 0) {
- $seriesTypes[$i + 1] = ['type' => $attachmentChartType, 'targetAxisIndex' => 1];
+ $seriesTypes[$i + 2] = ['type' => $attachmentChartType, 'targetAxisIndex' => 1];
} else
- $seriesTypes[$i + 1] = ['type' => $attachmentChartType];
+ $seriesTypes[$i + 2] = ['type' => $attachmentChartType];
array_push($chartSelected, $attachmentChartType);
}
diff --git a/src/Plugin/views/style/ChartsPluginStyleChart.php b/src/Plugin/views/style/ChartsPluginStyleChart.php
index 078cb53..611bd94 100644
--- a/src/Plugin/views/style/ChartsPluginStyleChart.php
+++ b/src/Plugin/views/style/ChartsPluginStyleChart.php
@@ -194,13 +194,13 @@ class ChartsPluginStyleChart extends StylePluginBase {
}
if ($label_field) {
- $chart['#legend_title'] = $label_field->options['label'];
+ $chart['#legend_title'] = $label_field['label'];
}
$chart[$this->view->current_display . '_series'] = [
'#type' => 'chart_data',
'#data' => $data,
- '#title' => $data_field->options['label'],
+ '#title' => $data_field['label'],
];
} else {
@@ -228,7 +228,7 @@ class ChartsPluginStyleChart extends StylePluginBase {
'#data' => [],
// If using a grouping field, inherit from the chart level colors.
'#color' => ($series_label === '' && isset($this->options['field_colors'][$field_key])) ? $this->options['field_colors'][$field_key] : NULL,
- '#title' => $series_label ? $series_label : $field_handler->options['label'],
+ '#title' => $series_label ? $series_label : $field_handler['label'],
'#prefix' => $this->options['yaxis_prefix'] ? $this->options['yaxis_prefix'] : NULL,
'#suffix' => $this->options['yaxis_suffix'] ? $this->options['yaxis_suffix'] : NULL,
'#decimal_count' => $this->options['yaxis_decimal_count'] ? $this->options['yaxis_decimal_count'] : NULL,
diff --git a/src/Util/Util.php b/src/Util/Util.php
index 70af87b..87f5caa 100644
--- a/src/Util/Util.php
+++ b/src/Util/Util.php
@@ -14,13 +14,18 @@ class Util {
public static function viewsData($view, $labelValues, $labelField, $color, $attachmentChartTypeOption) {
$data = [];
- foreach ($view->result as $id => $row) {
+ foreach ($view->result as $row_number => $row) {
$numberFields = 0;
$rowData = [];
foreach ($labelValues as $fieldId => $rowDataValue) {
+ $alter_text = $view->field[$labelField]->options['alter']['alter_text'];
+ if ($alter_text) {
+ $text = $view->field[$labelField]->options['alter']['text'];
+ $tokenized_text = trim(str_replace("\n", '', strip_tags($view->field[$labelField]->tokenizeValue($text, $row_number))));
+ }
$rowData[$numberFields] = [
'value' => $view->field[$fieldId]->getValue($row),
- 'label_field' => $view->field[$labelField]->getValue($row),
+ 'label_field' => ($alter_text) ? $tokenized_text : $view->field[$labelField]->getValue($row),
'label' => $view->field[$fieldId]->label(),
// 'label' => $view->display_handler->display['id'], to use display_id
'color' => $color[$fieldId],
@@ -28,7 +33,7 @@ class Util {
];
$numberFields++;
}
- $data[$id] = $rowData;
+ $data[$row_number] = $rowData;
}
return $data;
--
GitLab