diff --git a/app/helpers/analyze_helper.rb b/app/helpers/analyze_helper.rb index af47a8bb..d2462e84 100644 --- a/app/helpers/analyze_helper.rb +++ b/app/helpers/analyze_helper.rb @@ -35,9 +35,11 @@ module AnalyzeHelper end def colors - @colors ||= ["#49416D", "#FFC857", "#920020", "#00B0B3", "#B2D236", "#004D61", "#FFB3CC", "#74f7c0", "#212121", "#9E9D24", - "#689F38", "#388E3C", "#00897B", "#00796B", "#00695C", "#004D40", "#1B5E20", "#FF6F00", "#33691E", "#D50000", - "#827717", "#F57F17", "#FF6F00", "#E65100", "#BF360C", "#3E2723", "#263238", "#37474F", "#455A64"] + @colors ||= [ + "#49416D", "#FFC857", "#920020", "#00B0B3", "#B2D236", "#004D61", "#FFB3CC", "#E65100", "#7BAFDE", "#332288", + "#88CCEE", "#D155FF", "#999933", "#117733", "#882255", "#5289C7", "#F6C141", "#4EB265", "#E8601C", "#AE76A3", + "#90C987", "#BF360C", "#3E2723", "#827717", "#44AA99", "#AA4499", "#00897B", "#FF6F00", "#263238", "#CC6699" + ] end def empty_dataset?(measures:, school:, academic_year:) diff --git a/app/helpers/exports_helper.rb b/app/helpers/exports_helper.rb index 306a513a..5d97f401 100644 --- a/app/helpers/exports_helper.rb +++ b/app/helpers/exports_helper.rb @@ -1,7 +1,9 @@ module ExportsHelper def colors - @colors ||= ["#49416D", "#FFC857", "#920020", "#00B0B3", "#B2D236", "#004D61", "#FFB3CC", "#FF3D00", "#212121", "#9E9D24", - "#689F38", "#388E3C", "#00897B", "#00796B", "#00695C", "#004D40", "#1B5E20", "#FF6F00", "#33691E", "#D50000", - "#827717", "#F57F17", "#FF6F00", "#E65100", "#BF360C", "#3E2723", "#263238", "#37474F", "#455A64"] + @colors ||= [ + "#49416D", "#FFC857", "#920020", "#00B0B3", "#B2D236", "#004D61", "#FFB3CC", "#E65100", "#7BAFDE", "#332288", + "#88CCEE", "#D155FF", "#999933", "#117733", "#882255", "#5289C7", "#F6C141", "#4EB265", "#E8601C", "#AE76A3", + "#90C987", "#BF360C", "#3E2723", "#827717", "#44AA99", "#AA4499", "#00897B", "#FF6F00", "#263238", "#CC6699" + ] end end