Commit 2db56903 authored by Kevin Yumang's avatar Kevin Yumang

SERV-2286 - link object with javascript WIP

parent dc0e0354
...@@ -64,8 +64,10 @@ function set_data(objectData, elementObject, numberOfCharts, callback) { ...@@ -64,8 +64,10 @@ function set_data(objectData, elementObject, numberOfCharts, callback) {
'#66bb6a' '#66bb6a'
]; ];
console.log(objectData);
let options; let options;
let rawData = elementObject.attr('raw') ? JSON.parse(elementObject.attr('raw')) : null; let rawData = (objectData && objectData.rawData) ?? (elementObject.attr('raw') ? JSON.parse(elementObject.attr('raw')) : null);
if(rawData == null) { if(rawData == null) {
......
...@@ -100,7 +100,7 @@ Class ChartDataManager { ...@@ -100,7 +100,7 @@ Class ChartDataManager {
return $this->yAxisLabelValueFormat; return $this->yAxisLabelValueFormat;
} }
private function getRawData() : string private function getRawData() : ?string
{ {
return $this->rawData; return $this->rawData;
} }
...@@ -241,6 +241,7 @@ Class ChartDataManager { ...@@ -241,6 +241,7 @@ Class ChartDataManager {
$data['dataZoom'] = $this->getHasDataZoom(); $data['dataZoom'] = $this->getHasDataZoom();
$data['animationDuration'] = $this->getAnimationDuration(); $data['animationDuration'] = $this->getAnimationDuration();
$data['yAxisLabelValueFormat'] = $this->getYAxisLabelValueFormat(); $data['yAxisLabelValueFormat'] = $this->getYAxisLabelValueFormat();
$data['raw'] = $this->getRawData() == null ? null : json_encode(json_decode($this->getRawData()));
$data['pointValues'] = $this->getShowPointValues(); $data['pointValues'] = $this->getShowPointValues();
$data['stacked'] = $this->getIsStacked(); $data['stacked'] = $this->getIsStacked();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment