Commit 91ded59f authored by Kevin Yumang's avatar Kevin Yumang

SERV-2286 - refactor charts

parent d91bc808
...@@ -57,7 +57,7 @@ function set_data(elementObject, callback) { ...@@ -57,7 +57,7 @@ function set_data(elementObject, callback) {
let title = elementObject.attr('title') ?? null; let title = elementObject.attr('title') ?? null;
let colors = JSON.parse(elementObject.attr('colors')) ?? defaultColors; let colors = JSON.parse(elementObject.attr('colors')) ?? defaultColors;
let horizontal = (elementObject.attr('horizontal') === 'true' || elementObject.attr('horizontal') === true); // default false let horizontal = (elementObject.attr('horizontal') == 'true' || elementObject.attr('horizontal') == true); // default false
let animationDuration = elementObject.attr('animation-duration') ?? 750; let animationDuration = elementObject.attr('animation-duration') ?? 750;
// ex '{value} users' - https://echarts.apache.org/en/option.html#yAxis.axisLabel.formatter // ex '{value} users' - https://echarts.apache.org/en/option.html#yAxis.axisLabel.formatter
...@@ -119,10 +119,10 @@ function setSeries(seriesData, elementObject, horizontal = false) { ...@@ -119,10 +119,10 @@ function setSeries(seriesData, elementObject, horizontal = false) {
// uses series options if available else use global options. // uses series options if available else use global options.
let seriesArray = []; let seriesArray = [];
if(!seriesData || seriesData.length === 0) return []; if(!seriesData || seriesData.length == 0) return [];
let showBarValues = (elementObject.attr('bar-values') === 'true' || elementObject.attr('bar-values') === true) ?? false; let showBarValues = (elementObject.attr('bar-values') == 'true' || elementObject.attr('bar-values') == true) ?? false;
let stacked = (elementObject.attr('stacked') === 'true' || elementObject.attr('stacked') === true) ?? false; let stacked = (elementObject.attr('stacked') == 'true' || elementObject.attr('stacked') == true) ?? false;
let markLine = elementObject.attr('mark-line') ?? null; // min | max | average let markLine = elementObject.attr('mark-line') ?? null; // min | max | average
for(let i = 0; i < seriesData.length; i++) { for(let i = 0; i < seriesData.length; i++) {
......
...@@ -61,9 +61,9 @@ function set_data(elementObject, numberOfCharts, callback) { ...@@ -61,9 +61,9 @@ function set_data(elementObject, numberOfCharts, callback) {
let titles = JSON.parse(elementObject.attr('titles')) ?? []; let titles = JSON.parse(elementObject.attr('titles')) ?? [];
let colors = JSON.parse(elementObject.attr('colors')) ?? defaultColors; let colors = JSON.parse(elementObject.attr('colors')) ?? defaultColors;
let boundaryGap = (elementObject.attr('boundary-gap') === 'true' || elementObject.attr('boundary-gap') === true); // default true let boundaryGap = (elementObject.attr('boundary-gap') == 'true' || elementObject.attr('boundary-gap') == true); // default true
let inverted = (elementObject.attr('inverted') === 'true' || elementObject.attr('inverted') === true); // default false let inverted = (elementObject.attr('inverted') == 'true' || elementObject.attr('inverted') == true); // default false
let showDataZoom = (elementObject.attr('data-zoom') === 'true' || elementObject.attr('data-zoom') === true); // default false let showDataZoom = (elementObject.attr('data-zoom') == 'true' || elementObject.attr('data-zoom') == true); // default false
let animationDuration = elementObject.attr('animation-duration') ?? 750; let animationDuration = elementObject.attr('animation-duration') ?? 750;
// ex '{value} users' - https://echarts.apache.org/en/option.html#yAxis.axisLabel.formatter // ex '{value} users' - https://echarts.apache.org/en/option.html#yAxis.axisLabel.formatter
...@@ -111,7 +111,7 @@ function set_data(elementObject, numberOfCharts, callback) { ...@@ -111,7 +111,7 @@ function set_data(elementObject, numberOfCharts, callback) {
series: seriesObject series: seriesObject
}; };
if(showDataZoom === true) { if(showDataZoom == true) {
options.dataZoom = setDataZoom(showDataZoom, multichart); options.dataZoom = setDataZoom(showDataZoom, multichart);
} }
...@@ -143,11 +143,11 @@ function setSeries(seriesData, elementObject) { ...@@ -143,11 +143,11 @@ function setSeries(seriesData, elementObject) {
// uses series options if available else use global options. // uses series options if available else use global options.
let seriesArray = []; let seriesArray = [];
if(!seriesData || seriesData.length === 0) return []; if(!seriesData || seriesData.length == 0) return [];
let showPointValues = (elementObject.attr('point-values') === 'true' || elementObject.attr('point-values') === true) ?? false; let showPointValues = (elementObject.attr('point-values') == 'true' || elementObject.attr('point-values') == true) ?? false;
let stacked = (elementObject.attr('stacked') === 'true' || elementObject.attr('stacked') === true) ?? false; let stacked = (elementObject.attr('stacked') == 'true' || elementObject.attr('stacked') == true) ?? false;
let isArea = (elementObject.attr('is-area') === 'true' || elementObject.attr('is-area') === true) ?? false; let isArea = (elementObject.attr('is-area') == 'true' || elementObject.attr('is-area') == true) ?? false;
let markLine = elementObject.attr('mark-line') ?? null; // min | max | average let markLine = elementObject.attr('mark-line') ?? null; // min | max | average
for(let i = 0; i < seriesData.length; i++) { for(let i = 0; i < seriesData.length; i++) {
...@@ -286,7 +286,7 @@ function setTitles(titles, numberOfCharts = 1) { ...@@ -286,7 +286,7 @@ function setTitles(titles, numberOfCharts = 1) {
}; };
// if single else multichart // if single else multichart
if(i === 0 && numberOfCharts === 1) { if(i == 0 && numberOfCharts == 1) {
title.textStyle = { title.textStyle = {
color: '#fff' color: '#fff'
}; };
...@@ -364,13 +364,13 @@ function setGrid(showDataZoom = false, numberOfCharts = 1) { ...@@ -364,13 +364,13 @@ function setGrid(showDataZoom = false, numberOfCharts = 1) {
}; };
// if single else multichart // if single else multichart
if(i === 0 && numberOfCharts === 1) { if(i == 0 && numberOfCharts == 1) {
grid.right = 40; grid.right = 40;
grid.top = 50; grid.top = 50;
grid.bottom = showDataZoom ? 60 : 0; grid.bottom = showDataZoom ? 60 : 0;
} else { } else {
grid.right = 20; grid.right = 20;
grid.top = (i === 0) ? 40 : (arrayGrids[i-1].top + 240); // previous top + chart height = 160 + charts spacing = 80 grid.top = (i == 0) ? 40 : (arrayGrids[i-1].top + 240); // previous top + chart height = 160 + charts spacing = 80
grid.height = 160; grid.height = 160;
} }
...@@ -433,7 +433,7 @@ function setArea(series, seriesData, isArea) { ...@@ -433,7 +433,7 @@ function setArea(series, seriesData, isArea) {
let area = seriesData.isArea ?? isArea; let area = seriesData.isArea ?? isArea;
if(area === true) { if(area == true) {
series.areaStyle = {}; series.areaStyle = {};
} }
......
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