devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated the module generation to allow for only certain parts to be made

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-01-22 18:50:12 +00:00
parent c868ea8795
commit 81943dbf42
5 changed files with 64 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/exam.ts
View File

@@ -1,7 +1,7 @@
import {Module} from "."; import {Module} from ".";
export type Exam = ReadingExam | ListeningExam | WritingExam | SpeakingExam | LevelExam; export type Exam = ReadingExam | ListeningExam | WritingExam | SpeakingExam | LevelExam;
export type Variant = "diagnostic" | "partial"; export type Variant = "full" | "diagnostic" | "partial";
export interface ReadingExam { export interface ReadingExam {
parts: ReadingPart[]; parts: ReadingPart[];

15
src/pages/(generation)/ListeningGeneration.tsx
View File

@@ -110,6 +110,7 @@ const ListeningGeneration = () => {
const [part2, setPart2] = useState<ListeningPart>(); const [part2, setPart2] = useState<ListeningPart>();
const [part3, setPart3] = useState<ListeningPart>(); const [part3, setPart3] = useState<ListeningPart>();
const [part4, setPart4] = useState<ListeningPart>(); const [part4, setPart4] = useState<ListeningPart>();
const [minTimer, setMinTimer] = useState(60);
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [resultingExam, setResultingExam] = useState<ListeningExam>(); const [resultingExam, setResultingExam] = useState<ListeningExam>();
const [types, setTypes] = useState<string[]>([]); const [types, setTypes] = useState<string[]>([]);
@@ -129,12 +130,13 @@ const ListeningGeneration = () => {
const toggleType = (type: string) => setTypes((prev) => (prev.includes(type) ? [...prev.filter((x) => x !== type)] : [...prev, type])); const toggleType = (type: string) => setTypes((prev) => (prev.includes(type) ? [...prev.filter((x) => x !== type)] : [...prev, type]));
const submitExam = () => { const submitExam = () => {
if (!part1 || !part2 || !part3 || !part4) return toast.error("Please generate all for sections!"); const parts = [part1, part2, part3, part4].filter((x) => !!x);
if (parts.length === 0) return toast.error("Please generate at least one section!");
setIsLoading(true); setIsLoading(true);
axios axios
.post(`/api/exam/listening/generate/listening`, {parts: [part1, part2, part3, part4]}) .post(`/api/exam/listening/generate/listening`, {parts, minTimer})
.then((result) => { .then((result) => {
playSound("sent"); playSound("sent");
console.log(`Generated Exam ID: ${result.data.id}`); console.log(`Generated Exam ID: ${result.data.id}`);
@@ -172,6 +174,11 @@ const ListeningGeneration = () => {
return ( return (
<> <>
<div className="flex flex-col gap-3">
<label className="font-normal text-base text-mti-gray-dim">Timer</label>
<Input type="number" name="minTimer" onChange={(e) => setMinTimer(parseInt(e))} value={minTimer} className="max-w-[300px]" />
</div>
<div className="flex flex-col gap-3"> <div className="flex flex-col gap-3">
<label className="font-normal text-base text-mti-gray-dim">Exercises</label> <label className="font-normal text-base text-mti-gray-dim">Exercises</label>
<div className="flex flex-row -2xl:flex-wrap w-full gap-4 -md:justify-center justify-between"> <div className="flex flex-row -2xl:flex-wrap w-full gap-4 -md:justify-center justify-between">
@@ -264,14 +271,14 @@ const ListeningGeneration = () => {
</button> </button>
)} )}
<button <button
disabled={!part1 || !part2 || !part3 || !part4 || isLoading} disabled={(!part1 && !part2 && !part3 && !part4) || isLoading}
data-tip="Please generate all three passages" data-tip="Please generate all three passages"
onClick={submitExam} onClick={submitExam}
className={clsx( className={clsx(
"bg-ielts-listening/70 border border-ielts-listening text-white w-full max-w-[200px] rounded-xl h-[70px] self-end", "bg-ielts-listening/70 border border-ielts-listening text-white w-full max-w-[200px] rounded-xl h-[70px] self-end",
"hover:bg-ielts-listening disabled:bg-ielts-listening/40 disabled:cursor-not-allowed", "hover:bg-ielts-listening disabled:bg-ielts-listening/40 disabled:cursor-not-allowed",
"transition ease-in-out duration-300", "transition ease-in-out duration-300",
(!part1 || !part2 || !part3 || !part4) && "tooltip", !part1 && !part2 && !part3 && !part4 && "tooltip",
)}> )}>
{isLoading ? ( {isLoading ? (
<div className="flex items-center justify-center"> <div className="flex items-center justify-center">

20
src/pages/(generation)/ReadingGeneration.tsx
View File

@@ -87,6 +87,7 @@ const ReadingGeneration = () => {
const [part1, setPart1] = useState<ReadingPart>(); const [part1, setPart1] = useState<ReadingPart>();
const [part2, setPart2] = useState<ReadingPart>(); const [part2, setPart2] = useState<ReadingPart>();
const [part3, setPart3] = useState<ReadingPart>(); const [part3, setPart3] = useState<ReadingPart>();
const [minTimer, setMinTimer] = useState(60);
const [types, setTypes] = useState<string[]>([]); const [types, setTypes] = useState<string[]>([]);
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [resultingExam, setResultingExam] = useState<ReadingExam>(); const [resultingExam, setResultingExam] = useState<ReadingExam>();
@@ -122,19 +123,21 @@ const ReadingGeneration = () => {
}; };
const submitExam = () => { const submitExam = () => {
if (!part1 || !part2 || !part3) { const parts = [part1, part2, part3].filter((x) => !!x) as ReadingPart[];
toast.error("Please generate all three passages before submitting"); if (parts.length === 0) {
toast.error("Please generate at least one passage before submitting");
return; return;
} }
setIsLoading(true); setIsLoading(true);
const exam: ReadingExam = { const exam: ReadingExam = {
parts: [part1, part2, part3], parts,
isDiagnostic: false, isDiagnostic: false,
minTimer: 60, minTimer,
module: "reading", module: "reading",
id: v4(), id: v4(),
type: "academic", type: "academic",
variant: parts.length === 3 ? "full" : "partial",
}; };
axios axios
@@ -159,6 +162,11 @@ const ReadingGeneration = () => {
return ( return (
<> <>
<div className="flex flex-col gap-3">
<label className="font-normal text-base text-mti-gray-dim">Timer</label>
<Input type="number" name="minTimer" onChange={(e) => setMinTimer(parseInt(e))} value={minTimer} className="max-w-[300px]" />
</div>
<div className="flex flex-col gap-3"> <div className="flex flex-col gap-3">
<label className="font-normal text-base text-mti-gray-dim">Exercises</label> <label className="font-normal text-base text-mti-gray-dim">Exercises</label>
<div className="flex flex-row -2xl:flex-wrap w-full gap-4 -md:justify-center justify-between"> <div className="flex flex-row -2xl:flex-wrap w-full gap-4 -md:justify-center justify-between">
@@ -237,14 +245,14 @@ const ReadingGeneration = () => {
</button> </button>
)} )}
<button <button
disabled={!part1 || !part2 || !part3 || isLoading} disabled={(!part1 && !part2 && !part3) || isLoading}
data-tip="Please generate all three passages" data-tip="Please generate all three passages"
onClick={submitExam} onClick={submitExam}
className={clsx( className={clsx(
"bg-ielts-reading/70 border border-ielts-reading text-white w-full max-w-[200px] rounded-xl h-[70px] self-end", "bg-ielts-reading/70 border border-ielts-reading text-white w-full max-w-[200px] rounded-xl h-[70px] self-end",
"hover:bg-ielts-reading disabled:bg-ielts-reading/40 disabled:cursor-not-allowed", "hover:bg-ielts-reading disabled:bg-ielts-reading/40 disabled:cursor-not-allowed",
"transition ease-in-out duration-300", "transition ease-in-out duration-300",
(!part1 || !part2 || !part3) && "tooltip", !part1 && !part2 && !part3 && "tooltip",
)}> )}>
{isLoading ? ( {isLoading ? (
<div className="flex items-center justify-center"> <div className="flex items-center justify-center">

14
src/pages/(generation)/SpeakingGeneration.tsx
View File

@@ -99,6 +99,7 @@ const SpeakingGeneration = () => {
const [part1, setPart1] = useState<SpeakingPart>(); const [part1, setPart1] = useState<SpeakingPart>();
const [part2, setPart2] = useState<SpeakingPart>(); const [part2, setPart2] = useState<SpeakingPart>();
const [part3, setPart3] = useState<SpeakingPart>(); const [part3, setPart3] = useState<SpeakingPart>();
const [minTimer, setMinTimer] = useState(14);
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [resultingExam, setResultingExam] = useState<SpeakingExam>(); const [resultingExam, setResultingExam] = useState<SpeakingExam>();
@@ -108,12 +109,12 @@ const SpeakingGeneration = () => {
const setSelectedModules = useExamStore((state) => state.setSelectedModules); const setSelectedModules = useExamStore((state) => state.setSelectedModules);
const submitExam = () => { const submitExam = () => {
if (!part1 || !part2 || !part3) return toast.error("Please generate all for tasks!"); if (!part1 && !part2 && !part3) return toast.error("Please generate at least one task!");
setIsLoading(true); setIsLoading(true);
axios axios
.post(`/api/exam/speaking/generate/speaking`, {exercises: [part1, part2, part3]}) .post(`/api/exam/speaking/generate/speaking`, {exercises: [part1, part2, part3].filter((x) => !!x), minTimer})
.then((result) => { .then((result) => {
playSound("sent"); playSound("sent");
console.log(`Generated Exam ID: ${result.data.id}`); console.log(`Generated Exam ID: ${result.data.id}`);
@@ -149,6 +150,11 @@ const SpeakingGeneration = () => {
return ( return (
<> <>
<div className="flex flex-col gap-3">
<label className="font-normal text-base text-mti-gray-dim">Timer</label>
<Input type="number" name="minTimer" onChange={(e) => setMinTimer(parseInt(e))} value={minTimer} className="max-w-[300px]" />
</div>
<Tab.Group> <Tab.Group>
<Tab.List className="flex space-x-1 rounded-xl bg-ielts-speaking/20 p-1"> <Tab.List className="flex space-x-1 rounded-xl bg-ielts-speaking/20 p-1">
<Tab <Tab
@@ -209,14 +215,14 @@ const SpeakingGeneration = () => {
</button> </button>
)} )}
<button <button
disabled={!part1 || !part2 || !part3 || isLoading} disabled={(!part1 && !part2 && !part3) || isLoading}
data-tip="Please generate all three passages" data-tip="Please generate all three passages"
onClick={submitExam} onClick={submitExam}
className={clsx( className={clsx(
"bg-ielts-speaking/70 border border-ielts-speaking text-white w-full max-w-[200px] rounded-xl h-[70px] self-end", "bg-ielts-speaking/70 border border-ielts-speaking text-white w-full max-w-[200px] rounded-xl h-[70px] self-end",
"hover:bg-ielts-speaking disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed", "hover:bg-ielts-speaking disabled:bg-ielts-speaking/40 disabled:cursor-not-allowed",
"transition ease-in-out duration-300", "transition ease-in-out duration-300",
(!part1 || !part2 || !part3) && "tooltip", !part1 && !part2 && !part3 && "tooltip",
)}> )}>
{isLoading ? ( {isLoading ? (
<div className="flex items-center justify-center"> <div className="flex items-center justify-center">

44
src/pages/(generation)/WritingGeneration.tsx
View File

@@ -1,5 +1,5 @@
import Input from "@/components/Low/Input"; import Input from "@/components/Low/Input";
import {WritingExam} from "@/interfaces/exam"; import {WritingExam, WritingExercise} from "@/interfaces/exam";
import useExamStore from "@/stores/examStore"; import useExamStore from "@/stores/examStore";
import {getExamById} from "@/utils/exams"; import {getExamById} from "@/utils/exams";
import {playSound} from "@/utils/sound"; import {playSound} from "@/utils/sound";
@@ -68,6 +68,7 @@ const TaskTab = ({task, index, setTask}: {task?: string; index: number; setTask:
const WritingGeneration = () => { const WritingGeneration = () => {
const [task1, setTask1] = useState<string>(); const [task1, setTask1] = useState<string>();
const [task2, setTask2] = useState<string>(); const [task2, setTask2] = useState<string>();
const [minTimer, setMinTimer] = useState(60);
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [resultingExam, setResultingExam] = useState<WritingExam>(); const [resultingExam, setResultingExam] = useState<WritingExam>();
@@ -93,18 +94,13 @@ const WritingGeneration = () => {
}; };
const submitExam = () => { const submitExam = () => {
if (!task1 || !task2) { if (!task1 && !task2) {
toast.error("Please generate all tasks before submitting"); toast.error("Please generate a task before submitting");
return; return;
} }
setIsLoading(true); const exercise1 = task1
const exam: WritingExam = { ? ({
isDiagnostic: false,
minTimer: 60,
module: "writing",
exercises: [
{
id: v4(), id: v4(),
type: "writing", type: "writing",
prefix: `You should spend about 20 minutes on this task.`, prefix: `You should spend about 20 minutes on this task.`,
@@ -115,8 +111,11 @@ const WritingGeneration = () => {
limit: 150, limit: 150,
type: "min", type: "min",
}, },
}, } as WritingExercise)
{ : undefined;
const exercise2 = task2
? ({
id: v4(), id: v4(),
type: "writing", type: "writing",
prefix: `You should spend about 40 minutes on this task.`, prefix: `You should spend about 40 minutes on this task.`,
@@ -127,9 +126,17 @@ const WritingGeneration = () => {
limit: 250, limit: 250,
type: "min", type: "min",
}, },
}, } as WritingExercise)
], : undefined;
setIsLoading(true);
const exam: WritingExam = {
isDiagnostic: false,
minTimer,
module: "writing",
exercises: [...(exercise1 ? [exercise1] : []), ...(exercise2 ? [exercise2] : [])],
id: v4(), id: v4(),
variant: exercise1 && exercise2 ? "full" : "partial",
}; };
axios axios
@@ -152,6 +159,11 @@ const WritingGeneration = () => {
return ( return (
<> <>
<div className="flex flex-col gap-3">
<label className="font-normal text-base text-mti-gray-dim">Timer</label>
<Input type="number" name="minTimer" onChange={(e) => setMinTimer(parseInt(e))} value={minTimer} className="max-w-[300px]" />
</div>
<Tab.Group> <Tab.Group>
<Tab.List className="flex space-x-1 rounded-xl bg-ielts-writing/20 p-1"> <Tab.List className="flex space-x-1 rounded-xl bg-ielts-writing/20 p-1">
<Tab <Tab
@@ -200,14 +212,14 @@ const WritingGeneration = () => {
</button> </button>
)} )}
<button <button
disabled={!task1 || !task2 || isLoading} disabled={(!task1 && !task2) || isLoading}
data-tip="Please generate all three passages" data-tip="Please generate all three passages"
onClick={submitExam} onClick={submitExam}
className={clsx( className={clsx(
"bg-ielts-writing/70 border border-ielts-writing text-white w-full max-w-[200px] rounded-xl h-[70px] self-end", "bg-ielts-writing/70 border border-ielts-writing text-white w-full max-w-[200px] rounded-xl h-[70px] self-end",
"hover:bg-ielts-writing disabled:bg-ielts-writing/40 disabled:cursor-not-allowed", "hover:bg-ielts-writing disabled:bg-ielts-writing/40 disabled:cursor-not-allowed",
"transition ease-in-out duration-300", "transition ease-in-out duration-300",
(!task1 || !task2) && "tooltip", !task1 && !task2 && "tooltip",
)}> )}>
{isLoading ? ( {isLoading ? (
<div className="flex items-center justify-center"> <div className="flex items-center justify-center">