set chart defaults whenver new data is loaded

Author: contactashish13

classes/Visualizer/Module/Chart.php

@@ -750,7 +750,7 @@ private function _handleTypesPage() {
 					update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
 				}
 
-				Visualizer_Module_Utility::set_defaults( $this->_chart, $type, $library );
+				Visualizer_Module_Utility::set_defaults( $this->_chart );
 
 				// redirect to next tab
 				// changed by Ash/Upwork
@@ -970,9 +970,15 @@ public function uploadData() {
 				update_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, $source->getSeries() );
 				update_post_meta( $chart->ID, Visualizer_Plugin::CF_SOURCE, $source->getSourceName() );
 				update_post_meta( $chart->ID, Visualizer_Plugin::CF_DEFAULT_DATA, 0 );
+
+				Visualizer_Module_Utility::set_defaults( $chart, null );
+
+				$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
+
 				$render->id     = $chart->ID;
 				$render->data   = json_encode( $source->getRawData() );
 				$render->series = json_encode( $source->getSeries() );
+				$render->settings = json_encode( $settings );
 			} else {
 				$render->message = esc_html__( 'CSV file is broken or invalid. Please, try again.', 'visualizer' );
 			}

classes/Visualizer/Module/Utility.php

@@ -125,8 +125,11 @@ private static function get_random_color() {
 	 *
 	 * @access public
 	 */
-	public static function set_defaults( $chart, $type, $library ) {
-		if ( $chart->post_status !== 'auto-draft' || $library !== 'ChartJS' ) {
+	public static function set_defaults( $chart, $post_status = 'auto-draft' ) {
+		$type           = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
+		$library        = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_LIBRARY, true );
+
+		if ( ( ! is_null( $post_status ) && $chart->post_status !== $post_status ) || $library !== 'ChartJS' ) {
 			return;
 		}
 

js/render-chartjs.js

@@ -292,7 +292,9 @@
         for (j = 0; j < atts.length; j++) {
             var values = [];
             for (var i = 0; i < rows.length; i++) {
-                values.push(settings.slices[i][atts[j]]);
+                if(typeof settings.slices[i] !== 'undefined' && typeof settings.slices[i][atts[j]] !== 'undefined'){
+                    values.push(settings.slices[i][atts[j]]);
+                }
             }
             var object = {};
             object[ atts[ j ] ] = values;