diff --git a/src/grading-settings/grading-scale/GradingScale.jsx b/src/grading-settings/grading-scale/GradingScale.jsx index d4d7d21dfb..792079dec1 100644 --- a/src/grading-settings/grading-scale/GradingScale.jsx +++ b/src/grading-settings/grading-scale/GradingScale.jsx @@ -227,6 +227,7 @@ const GradingScale = ({ idx={idx} handleLetterChange={handleLetterChange} letters={letters} + totalSegments={gradingSegments.length} /> ))} {handles.map(({ value, getHandleProps }, idx) => ( diff --git a/src/grading-settings/grading-scale/GradingScale.scss b/src/grading-settings/grading-scale/GradingScale.scss index e8023f0bb5..a38be2a8f8 100644 --- a/src/grading-settings/grading-scale/GradingScale.scss +++ b/src/grading-settings/grading-scale/GradingScale.scss @@ -58,12 +58,12 @@ display: none; } - @each $key, $color in $grading-scale-segment-colors { - &.segment-#{$key} { - background-color: $color; - z-index: #{$key}; - } - } + // @each $key, $color in $grading-scale-segment-colors { + // &.segment-#{$key} { + // background-color: $color; + // z-index: #{$key}; + // } + // } &:hover .grading-scale-segment-btn-remove { display: block; diff --git a/src/grading-settings/grading-scale/components/GradingScaleSegment.tsx b/src/grading-settings/grading-scale/components/GradingScaleSegment.tsx index 95d95b781a..1c5e34cd37 100644 --- a/src/grading-settings/grading-scale/components/GradingScaleSegment.tsx +++ b/src/grading-settings/grading-scale/components/GradingScaleSegment.tsx @@ -3,7 +3,7 @@ import { Button } from '@openedx/paragon'; import React, { ChangeEvent } from 'react'; import messages from '../messages'; -import { getLettersOnLongScale, getLettersOnShortScale } from '../utils'; +import { getLettersOnLongScale, getLettersOnShortScale, setGradeSegmentColor } from '../utils'; interface RangeSegment { previous: number, @@ -18,6 +18,7 @@ interface GradingScaleSegmentProps { letters: [string], gradingSegments: RangeSegment[], removeGradingSegment: (idx: number) => void, + totalSegments: number, } const GradingScaleSegment = ({ @@ -28,17 +29,22 @@ const GradingScaleSegment = ({ letters, gradingSegments, removeGradingSegment, + totalSegments }: GradingScaleSegmentProps) => { const intl = useIntl(); const prevValue = gradingSegments[idx === 0 ? 0 : idx - 1]?.previous ?? 0; const segmentRightMargin = (value - prevValue) < 6 ? '0.125rem' : '1.25rem'; return ( -
+
{ + const hue = ((total-index) / (total - 1)) * 130; + const saturation = index % 2 === 0 ? 100 : 50; + return `hsla(${hue}, ${saturation}%, 50%, 1)`; + }; diff --git a/src/grading-settings/scss/_variables.scss b/src/grading-settings/scss/_variables.scss index 31133bee5b..32c0e6cc91 100644 --- a/src/grading-settings/scss/_variables.scss +++ b/src/grading-settings/scss/_variables.scss @@ -1,7 +1,22 @@ -$grading-scale-segment-colors: ( - 0: #87D771, - 1: #FDE370, - 2: #F6BF58, - 3: #FF7E6A, - 4: #E94949, -); +// $grading-scale-segment-colors: ( +// 0: #0099B1, +// 1: #00B7D3, +// 2: #95D4DC, +// 3: #27B173, +// 4: #2ED389, +// 5: #93DBAF, +// 6: #D4BE17, +// 7: #F6DD1B, +// 8: #FFF2BB, +// 9: #F67B00, +// 10: #FF9B3B, +// 11: #E23900 +// ); + +// $grading-scale-segment-colors: ( +// 0: #87D771, +// 1: #FDE370, +// 2: #F6BF58, +// 3: #FF7E6A, +// 4: #E94949, +// );