SERV-2286 - refactor chart js files

src/Managers/ChartManager/ChartManager.js

@@ -57,6 +57,18 @@ class ChartManager {
         return objectData?.series ?? (JSON.parse(elementObject.attr('series')) ?? null);
     }
 
+    getChartSeriesNames(series) {
+        return series && series.map(function(item){ return item.name });
+    }
+
+    getRawData(objectData, elementObject) {
+        return objectData?.rawData ?? (elementObject.attr('raw') ? JSON.parse(elementObject.attr('raw')) : null);
+    }
+
+    getObjectData(elementObject) {
+        return elementObject.attr('data') ? JSON.parse(elementObject.attr('data')) : null;
+    }
+
     setSeriesMarkLine(series, seriesData, markLine) {
         if(seriesData.markLine !== undefined && ['min', 'max', 'average'].includes(markLine)) {
 

src/Views/Limitless/Barchart/Attachments/barchart.init.js

@@ -44,8 +44,8 @@ function set_data(elementObject, callback) {
 
         let options;
 
-        let objectData = elementObject.attr('data') ? JSON.parse(elementObject.attr('data')) : null;
-        let rawData = objectData?.rawData ?? (elementObject.attr('raw') ? JSON.parse(elementObject.attr('raw')) : null);
+        let objectData = chartManager.getObjectData(elementObject);
+        let rawData = chartManager.getRawData(objectData, elementObject);
 
         if(rawData == null) {
 
@@ -64,7 +64,7 @@ function set_data(elementObject, callback) {
             let categories = chartManager.getChartCategories(objectData, elementObject);
             let series = chartManager.getChartSeries(objectData, elementObject);
 
-            let seriesNames = series && series.map(function(item){ return item.name });
+            let seriesNames = chartManager.getChartSeriesNames(series);
             let seriesObject = setSeries(series, stacked, markLine, showBarValues, horizontal);
 
             // Options

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

@@ -28,7 +28,7 @@ function init_chart(chartId) {
         // elementObject for the charts parameters
         // objectData for the chart data manager
         let elementObject = $(chartElement);
-        let objectData = elementObject.attr('data') ? JSON.parse(elementObject.attr('data')) : null;
+        let objectData = chartManager.getObjectData(elementObject);
 
         let numberOfCharts = objectData?.charts ?? (elementObject.attr('charts') ?? 1);
         set_chart_height(numberOfCharts, chartElement)
@@ -51,7 +51,7 @@ function set_data(objectData, elementObject, numberOfCharts, callback) {
     setTimeout(function() {
 
         let options;
-        let rawData = objectData?.rawData ?? (elementObject.attr('raw') ? JSON.parse(elementObject.attr('raw')) : null);
+        let rawData = chartManager.getRawData(objectData, elementObject);
 
         if(rawData == null) {
 
@@ -75,7 +75,7 @@ function set_data(objectData, elementObject, numberOfCharts, callback) {
             let categories = chartManager.getChartCategories(objectData, elementObject);
             let series = chartManager.getChartSeries(objectData, elementObject);
 
-            let seriesNames = series && series.map(function(item){ return item.name });
+            let seriesNames = chartManager.getChartSeriesNames(series);
             let seriesObject = setSeries(series, stacked, markLine, showPointValues, isArea);
 
             // Options

src/Views/Limitless/Piechart/Attachments/piechart.init.js

@@ -43,8 +43,8 @@ function set_data(elementObject, callback) {
 
         let options;
 
-        let objectData = elementObject.attr('data') ? JSON.parse(elementObject.attr('data')) : null;
-        let rawData = elementObject.attr('raw') ? JSON.parse(elementObject.attr('raw')) : null;
+        let objectData = chartManager.getObjectData(elementObject);
+        let rawData = chartManager.getRawData(objectData, elementObject);
 
         if(rawData == null) {