Merge branch 'Simon-Initiative:master' into master

dtiwarATS · Dec 10, 2024 · af57342 · af57342
2 parents d690cb0 + 100170f
commit af57342
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/assets/src/components/activities/common/utils.tsx b/assets/src/components/activities/common/utils.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { ShortAnswerModelSchema } from '../short_answer/schema';
 import {
   HasPerPartSubmissionOption,
   PartId,
@@ -35,6 +36,12 @@ export const togglePerPartSubmissionOption = () => {
   };
 };
 
+export const toggleSubmitAndCompareOption = () => {
+  return (model: ShortAnswerModelSchema): void => {
+    model.submitAndCompare = !model.submitAndCompare;
+  };
+};
+
 interface ShuffleChoicesOptionProps {
   onShuffle: () => void;
   model: { authoring: { transformations: Transformation[] } };

diff --git a/assets/src/components/activities/short_answer/ShortAnswerAuthoring.tsx b/assets/src/components/activities/short_answer/ShortAnswerAuthoring.tsx
@@ -26,8 +26,10 @@ import { defaultWriterContext } from 'data/content/writers/context';
 import { configureStore } from 'state/store';
 import { AuthoringElement, AuthoringElementProps } from '../AuthoringElement';
 import { AuthoringElementProvider, useAuthoringElementContext } from '../AuthoringElementProvider';
+import { ActivitySettings } from '../common/authoring/settings/ActivitySettings';
 import { Explanation } from '../common/explanation/ExplanationAuthoring';
 import { ActivityScoring } from '../common/responses/ActivityScoring';
+import { toggleSubmitAndCompareOption } from '../common/utils';
 import { VariableEditorOrNot } from '../common/variables/VariableEditorOrNot';
 import { VariableActions } from '../common/variables/variableActions';
 import { ShortAnswerActions } from './actions';
@@ -38,6 +40,13 @@ const store = configureStore();
 const ShortAnswer = () => {
   const { dispatch, model, editMode, projectSlug } =
     useAuthoringElementContext<ShortAnswerModelSchema>();
+
+  const submitAndCompareSetting = {
+    label: 'Submit And Compare',
+    isEnabled: model.submitAndCompare === true,
+    onToggle: () => dispatch(toggleSubmitAndCompareOption()),
+  };
+
   return (
     <>
       <TabbedNavigation.Tabs>
@@ -167,6 +176,7 @@ const ShortAnswer = () => {
             onEdit={(t) => dispatch(VariableActions.onUpdateTransformations(t))}
           />
         </TabbedNavigation.Tab>
+        <ActivitySettings settings={[submitAndCompareSetting]} />
       </TabbedNavigation.Tabs>
     </>
   );