diff --git a/client/src/components/QuestionsDisplay/MultipleChoiceQuestionDisplay/MultipleChoiceQuestionDisplay.tsx b/client/src/components/QuestionsDisplay/MultipleChoiceQuestionDisplay/MultipleChoiceQuestionDisplay.tsx index ea07695..d951017 100644 --- a/client/src/components/QuestionsDisplay/MultipleChoiceQuestionDisplay/MultipleChoiceQuestionDisplay.tsx +++ b/client/src/components/QuestionsDisplay/MultipleChoiceQuestionDisplay/MultipleChoiceQuestionDisplay.tsx @@ -72,91 +72,93 @@ const MultipleChoiceQuestionDisplay: React.FC = (props) => { const alpha = Array.from(Array(26)).map((_e, i) => i + 65); const alphabet = alpha.map((x) => String.fromCharCode(x)); return ( - -
-
-
-
-
- - {question.choices.map((choice, i) => { - const selected = answer === choice.formattedText.text ? 'selected' : ''; - const rateStyle = showCorrectAnswers ? { - backgroundImage: `linear-gradient(to right, ${choice.isCorrect ? 'lightgreen' : 'lightcoral'} ${pickRates.percentages[i]}%, transparent ${pickRates.percentages[i]}%)`, - color: 'black' - } : {}; - return ( -
- {/* */} +
- {choice.formattedFeedback && showAnswer && ( -
-
-
- )} - */} - -
- ); - })} -
- {question.formattedGlobalFeedback && showAnswer && ( -
-
-
- )} - - {!showAnswer && handleOnSubmitAnswer && ( - -
+ {question.formattedGlobalFeedback && showAnswer && ( +
+
+
+ )} - - )} - - {isDisplayOnly && ( -
- + {!showAnswer && handleOnSubmitAnswer && ( + + + )}
- )} + {isDisplayOnly && ( +
+ +
+ )} +
); }; diff --git a/client/src/components/QuestionsDisplay/TrueFalseQuestionDisplay/TrueFalseQuestionDisplay.tsx b/client/src/components/QuestionsDisplay/TrueFalseQuestionDisplay/TrueFalseQuestionDisplay.tsx index 1f77ef7..796614b 100644 --- a/client/src/components/QuestionsDisplay/TrueFalseQuestionDisplay/TrueFalseQuestionDisplay.tsx +++ b/client/src/components/QuestionsDisplay/TrueFalseQuestionDisplay/TrueFalseQuestionDisplay.tsx @@ -105,7 +105,7 @@ const TrueFalseQuestionDisplay: React.FC = (props) => {
{showCorrectAnswers && ( <> -
{question.isTrue ? '✅' : '❌'} {pickRates.trueRate}/{pickRates.totalCount} ({pickRates.trueRate.toFixed(1)}%)
+
{question.isTrue ? '✅' : '❌'} {pickRates.trueCount}/{pickRates.totalCount} ({pickRates.trueRate.toFixed(1)}%)
)}