SERV-2286 - line chart minor refactor

src/Views/Limitless/Linechart/Attachments/linechart.init.js

@@ -74,28 +74,29 @@ function set_data(objectData, elementObject, numberOfCharts, callback) {
             let multichart = (numberOfCharts > 1);
 
             // variables (this will be set by user)
-            let titles = objectData?.titles ?? (JSON.parse(elementObject.attr('titles')) ?? []);
-            let colors = objectData?.colors ?? (JSON.parse(elementObject.attr('colors')) ?? defaultColors);
 
+            // unique attributes of line chart
+            let titles = objectData?.titles ?? (JSON.parse(elementObject.attr('titles')) ?? []);
             let boundaryGap = objectData?.boundaryGap ?? (elementObject.attr('boundary-gap') == 'true' || elementObject.attr('boundary-gap') == true); // default true
             let inverted = objectData?.inverted ?? (elementObject.attr('inverted') == 'true' || elementObject.attr('inverted') == true); // default false
             let showDataZoom = objectData?.dataZoom ?? (elementObject.attr('data-zoom') == 'true' || elementObject.attr('data-zoom') == true); // default false
+            let showPointValues = objectData?.pointValues ?? ((elementObject.attr('point-values') == 'true' || elementObject.attr('point-values') == true) ?? false); // series data option
 
+
+            let colors = objectData?.colors ?? (JSON.parse(elementObject.attr('colors')) ?? defaultColors);
             let animationDuration = objectData?.animationDuration ?? (elementObject.attr('animation-duration') ?? 750);
             // ex '{value} users'  - https://echarts.apache.org/en/option.html#yAxis.axisLabel.formatter
             let yAxisLabelValueFormat = objectData?.yAxisLabelValueFormat ?? (elementObject.attr('y-axis-label-value-format') ?? null);
 
-            // global settings for series data
-            let showPointValues = objectData?.pointValues ?? ((elementObject.attr('point-values') == 'true' || elementObject.attr('point-values') == true) ?? false);
-            let stacked = objectData?.stacked ?? ((elementObject.attr('stacked') == 'true' || elementObject.attr('stacked') == true) ?? false);
-            let isArea = objectData?.isArea ?? ((elementObject.attr('is-area') == 'true' || elementObject.attr('is-area') == true) ?? false);
-            let markLine = objectData?.markLine ?? (elementObject.attr('mark-line') ?? null); // min | max | average
+            let stacked = objectData?.stacked ?? ((elementObject.attr('stacked') == 'true' || elementObject.attr('stacked') == true) ?? false); // series data options
+            let isArea = objectData?.isArea ?? ((elementObject.attr('is-area') == 'true' || elementObject.attr('is-area') == true) ?? false); // series data options
+            let markLine = objectData?.markLine ?? (elementObject.attr('mark-line') ?? null); // min | max | average - series data options
 
             let categories = objectData?.categories ?? (JSON.parse(elementObject.attr('categories')) ?? null);
             let series = objectData?.series ?? (JSON.parse(elementObject.attr('series')) ?? null);
 
             let seriesNames = series && series.map(function(item){ return item.name });
-            let seriesObject = setSeries(series, showPointValues, stacked, isArea, markLine);
+            let seriesObject = setSeries(series, stacked, markLine, showPointValues, isArea);
 
             // Options
             options = {
@@ -162,7 +163,7 @@ function set_chart_height(numberOfCharts, chartElement) {
 
 //#region FUNCTIONS FOR OPTIONS
 
-function setSeries(seriesData, showPointValues, stacked, isArea, markLine) {
+function setSeries(seriesData, stacked, markLine, showPointValues, isArea) {
 
     // setting the data first checks for the data chart manager object and if specific attributes are not set then will use the chart element parameters. else defaults.
     // uses series options if available else use chart manager or chart parameter settings