ENCOA-260, ENCOA-259

src/components/ExamEditor/SettingsEditor/index.tsx

@@ -34,7 +34,9 @@ const SettingsEditor: React.FC<SettingsEditorProps> = ({
     canPreview,
     canSubmit
 }) => {
+    const { dispatch } = useExamEditorStore()
     const examLabel = useExamEditorStore((state) => state.modules[module].examLabel) || '';
+    const type = useExamEditorStore((s) => s.modules[module].type);
     const { localSettings, updateLocalAndScheduleGlobal } = useSettingsState<SectionSettings>(
         module,
         sectionId
@@ -50,6 +52,18 @@ const SettingsEditor: React.FC<SettingsEditorProps> = ({
         updateLocalAndScheduleGlobal({ category: text });
     }, [updateLocalAndScheduleGlobal]);
 
+    const typeOptions = [
+        { value: 'general', label: 'General' },
+        { value: 'academic', label: 'Academic' }
+    ];
+
+    const onTypeChange = useCallback((option: { value: string | null, label: string }) => {
+        dispatch({
+            type: 'UPDATE_MODULE',
+            payload: { module, updates: { type: option.value as "academic" | "general" | undefined } }
+        });
+    }, [dispatch, module]);
+
     const onIntroOptionChange = useCallback((option: { value: string | null, label: string }) => {
         let updates: Partial<SectionSettings> = { introOption: option };
 
@@ -79,7 +93,7 @@ const SettingsEditor: React.FC<SettingsEditorProps> = ({
             currentIntro: text
         });
     }, [updateLocalAndScheduleGlobal]);
-    
+
     return (
         <div className={`flex flex-col gap-8 border bg-ielts-${module}/20 rounded-3xl p-8 w-1/3 h-fit`}>
             <div className={`w-full flex justify-center text-ielts-${module} font-bold text-xl`}>{sectionLabel} Settings</div>
@@ -100,6 +114,18 @@ const SettingsEditor: React.FC<SettingsEditorProps> = ({
                         value={localSettings.category || ''}
                     />
                 </Dropdown>
+                {["reading", "writing"].includes(module) && <Dropdown
+                    title="Type"
+                    module={module}
+                    open={localSettings.isTypeDropdownOpen}
+                    setIsOpen={(isOpen: boolean) => updateLocalAndScheduleGlobal({ isTypeDropdownOpen: isOpen }, false)}
+                >
+                    <Select
+                        options={typeOptions}
+                        onChange={(o) => onTypeChange({ value: o!.value, label: o!.label })}
+                        value={typeOptions.find(o => o.value === type)}
+                    />
+                </Dropdown>}
                 <Dropdown
                     title="Divider"
                     module={module}

src/components/ExamEditor/SettingsEditor/reading/index.tsx

@@ -31,6 +31,7 @@ const ReadingSettings: React.FC = () => {
         sections,
         minTimer,
         isPrivate,
+        type,
     } = useExamEditorStore(state => state.modules[currentModule]);
 
     const { localSettings, updateLocalAndScheduleGlobal } = useSettingsState<ReadingSectionSettings>(
@@ -78,10 +79,10 @@ const ReadingSettings: React.FC = () => {
             minTimer,
             module: "reading",
             id: title,
-            type: "academic",
             variant: sections.length === 3 ? "full" : "partial",
             difficulty,
             private: isPrivate,
+            type: type!
         };
 
         axios.post(`/api/exam/reading`, exam)
@@ -112,6 +113,7 @@ const ReadingSettings: React.FC = () => {
             variant: undefined,
             difficulty,
             private: isPrivate,
+            type: type!
         } as ReadingExam);
         setExerciseIndex(0);
         setQuestionIndex(0);

src/components/ExamEditor/SettingsEditor/writing/index.tsx

@@ -25,6 +25,7 @@ const WritingSettings: React.FC = () => {
         isPrivate,
         sections,
         focusedSection,
+        type
     } = useExamEditorStore((store) => store.modules["writing"]);
 
     const states = sections.flatMap((s) => s.state) as WritingExercise[];
@@ -72,6 +73,7 @@ const WritingSettings: React.FC = () => {
             variant: undefined,
             difficulty,
             private: isPrivate,
+            type: type!
         });
         setExerciseIndex(0);
         openDetachedTab("popout?type=Exam&module=writing", router)
@@ -94,6 +96,7 @@ const WritingSettings: React.FC = () => {
             variant: undefined,
             difficulty,
             private: isPrivate,
+            type: type!
         };
 
         axios