Merge pull request #644 from ccnmtl/ERD-356

Remove redo; fix text; fix missing option

Author: ndittren

media/js/src/simulations/simulation1/multipleChoiceQuestion.jsx

@@ -23,20 +23,30 @@ export const MultipleChoiceQuestion = ({
         setSelectedOption(option);
     };
 
+    const handleRetry = () => {
+        setIsAnswered(false);
+        setIsCorrect(null);
+        setSelectedOption(null);
+    };
+
     const handleSubmit = async() => {
         setIsAnswered(true);
         // eslint-disable-next-line max-len
         const correct = extractTextContent(selectedOption) === extractTextContent(answer);
         setIsCorrect(correct);
-        const questionType = header;
-        const textOption = extractTextContent(selectedOption);
 
-        await saveAnswer(submissionId, questionNumber, questionType,
-            textOption, correct, {});
+        await saveAnswer(submissionId, questionNumber, header,
+            extractTextContent(selectedOption), correct, {});
 
-        setIsSubmitted(correct);
+        if (correct) {
+            setIsSubmitted(true);
+        } else {
+            setIsSubmitted(false); // Allow retry for incorrect answers
+        }
     };
 
+    const isQualifier = header === 'Qualifier';
+
     useEffect(() => {
         setShuffledOptions(shuffleArray([...options]));
         document.getElementById(`multiple-${idkey}`).scrollIntoView(
@@ -96,6 +106,15 @@ export const MultipleChoiceQuestion = ({
                             {isCorrect ? correctFeedback : incorrectFeedback}
                         </div>
                     )}
+                    {isAnswered && !isCorrect && !isQualifier && (
+                        <div className="mt-3">
+                            <button
+                                className="btn btn-sm btn-warning"
+                                onClick={handleRetry}>
+                                Retry
+                            </button>
+                        </div>
+                    )}
                 </div>
             </div>
         </div> {/* div class=simulation__step-container */}

media/js/src/simulations/simulation1/simulationOneQuiz.jsx

@@ -37,13 +37,16 @@ export const SimulationOneQuiz = ({
                 setIsSubmitted(false);
                 setCompletedChoices([...completedChoices, choiceKey]);
                 setShowQualifier(true);
+                setShowRedoButton(false);
             } else {
                 setCompletedChoices([...completedChoices, choiceKey]);
                 setSelectedAltHypothesis(null);
                 setIsSubmitted(true);
+                setShowRedoButton(false);
             }
             if (plotType === '3d' && choiceKey === 'A') {
                 setShowContinueToB(true);
+                setShowRedoButton(false);
             }
         } else {
             if (choiceKey === 'A') {
@@ -252,12 +255,12 @@ export const SimulationOneQuiz = ({
                                 className="katex-inline"/> Perform a
                                 hypothesis test against the null hypothesis.
                         </p>
-                        <ol className="listset-alpha listset-alpha-listnum">
+                        <ol className="listset-alpha listset-alpha-listnum"
+                            key={completedChoices.length}>
                             {/* Choice A default display */}
                             {renderChoice('A', '\\Eta_1: {\\beta_1}{\\neq} ')}
 
-                            {completedChoices.includes('A') &&
-                            isTakeawayCorrect.A && (
+                            {completedChoices.includes('A') && (
                                 renderChoice('B', '\\Eta_1: {\\beta_1}{\\gt} ')
                             )}
                             {completedChoices.includes('B') && (
@@ -530,7 +533,7 @@ export const SimulationOneQuiz = ({
                         would be smaller.
                     </span>,
                     <span>
-                        Excellent! You have correctly identified the correct
+                        Excellent! You identified the correct
                         answer.
                     </span>,
                     <span>