ChartJS: manual addition of data changes color for existing values

Author: contactashish13

classes/Visualizer/Module/Utility.php

@@ -214,8 +214,12 @@ private static function set_defaults_chartjs( $chart, $post_status ) {
 				// fall through.
 			case 'bar':
 				for ( $i = 0; $i < $max; $i++ ) {
-					$colors = self::get_random_color();
-					$attributes[] = array( 'backgroundColor' => $colors[0], 'hoverBackgroundColor' => $colors[1] );
+					if ( isset( $settings[ $name ][ $i ]['backgroundColor'] ) && ! empty( $settings[ $name ][ $i ]['backgroundColor'] ) ) {
+						$attributes[] = array( 'backgroundColor' => $settings[ $name ][ $i ]['backgroundColor'], 'hoverBackgroundColor' => $settings[ $name ][ $i ]['hoverBackgroundColor'] );
+					} else {
+						$colors = self::get_random_color();
+						$attributes[] = array( 'backgroundColor' => $colors[0], 'hoverBackgroundColor' => $colors[1] );
+					}
 				}
 				break;
 			case 'radar':
@@ -224,8 +228,12 @@ private static function set_defaults_chartjs( $chart, $post_status ) {
 				// fall through.
 			case 'area':
 				for ( $i = 0; $i < $max; $i++ ) {
-					$colors = self::get_random_color();
-					$attributes[] = array( 'borderColor' => $colors[0] );
+					if ( isset( $settings[ $name ][ $i ]['borderColor'] ) && ! empty( $settings[ $name ][ $i ]['borderColor'] ) ) {
+						$attributes[] = array( 'borderColor' => $settings[ $name ][ $i ]['borderColor'] );
+					} else {
+						$colors = self::get_random_color();
+						$attributes[] = array( 'borderColor' => $colors[0] );
+					}
 				}
 				break;
 		}