+
+
+ );
+}
+
+function ImageViewer({ material }: { material: ChapterMaterial }) {
+ const src = material.url || (material.file_url ? getContentUrl(material.id) : null);
+ if (!src) return
+ 
+
+ );
+}
+
+function ArticleViewer({ material }: { material: ChapterMaterial }) {
+ if (!material.description) return
+
+ );
+}
+
+function LinkViewer({ material }: { material: ChapterMaterial }) {
+ if (!material.url) return {material.description}
+
+
+ );
+}
+
+function EmptyState({ message }: { message: string }) {
+ return (
+
+
+
+
+
+ );
+}
+
+const viewers: Record{message}
+
+ {typeIcons[material.type]}
+ {typeLabels[material.type]}
+
+ {material.description}
+ )} +
+ {material.allow_download && material.file_url && onDownload && (
+
+ )}
+ {material.url && (
+
+ )}
+
+
+
+
+
+ );
+}
diff --git a/src/components/TeacherLayout.tsx b/src/components/TeacherLayout.tsx
index caeccae..a939eb8 100644
--- a/src/components/TeacherLayout.tsx
+++ b/src/components/TeacherLayout.tsx
@@ -2,7 +2,7 @@ import RoleLayout, { NavGroup } from "./RoleLayout";
import {
LayoutDashboard, BookOpen, ClipboardList, FileText,
CalendarCheck, Users, Calendar, User, MessageSquare,
- Megaphone, Wand2,
+ Megaphone, Wand2, Library,
} from "lucide-react";
const navGroups: NavGroup[] = [
@@ -11,6 +11,7 @@ const navGroups: NavGroup[] = [
items: [
{ title: "Dashboard", url: "/teacher/dashboard", icon: LayoutDashboard },
{ title: "Courses", url: "/teacher/courses", icon: BookOpen },
+ { title: "Resource Library", url: "/teacher/library", icon: Library },
{ title: "Assignments", url: "/teacher/assignments", icon: ClipboardList },
],
},
diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
index 8249e2f..825c947 100644
--- a/src/components/ui/dialog.tsx
+++ b/src/components/ui/dialog.tsx
@@ -35,6 +35,7 @@ const DialogContent = React.forwardRef<
+
+
+ {numericDomainId && (topics ?? []).length > 0 && (
+
+
+
+
+
+
+
+
+
+
+
+ )}
+
+ {topicIds.length > 0 && objectives.length > 0 && (
+
+ {(topics ?? []).map(t => (
+ toggleTopic(t.id)}
+ >
+ {t.name}
+
+ ))}
+
+
+
+
+ )}
+
+ {objectives.map(o => (
+
+ ))}
+
+ Classrooms
-Create and manage batches (classrooms).
+Create and manage classrooms with students.
-
@@ -69,29 +145,67 @@ export default function ClassroomsPage() {
Name
Course
Students
- Capacity
Dates
Status
-
{filtered.length === 0 && (
- No classrooms found.
+
+ No classrooms found.
+
+
)}
{filtered.map((b) => (
{b.name}
- {b.course_name}
- {b.capacity}
- {b.start_date} — {b.end_date}
- {b.status} {b.course_name || "—"}
-
+
+ {b.start_date && b.end_date
+ ? `${b.start_date} — ${b.end_date}`
+ : "—"}
+
+
+
+ {b.status}
+
+
+
+
))}
@@ -100,34 +214,234 @@ export default function ClassroomsPage() {
)}
+ {/* Create Dialog */}
+
+ {/* Edit Dialog */}
+
+
+ {/* Students Management Dialog */}
+
+
+ {/* Add Students to Batch Dialog */}
+
);
}
diff --git a/src/pages/EntitiesPage.tsx b/src/pages/EntitiesPage.tsx
index e58dc45..ef51a99 100644
--- a/src/pages/EntitiesPage.tsx
+++ b/src/pages/EntitiesPage.tsx
@@ -5,91 +5,280 @@ import { Button } from "@/components/ui/button";
import { Badge } from "@/components/ui/badge";
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "@/components/ui/dialog";
import { Label } from "@/components/ui/label";
-import { Search, Plus, Building2, Trash2 } from "lucide-react";
-import { useDepartments, useCreateDepartment, useDeleteDepartment } from "@/hooks/queries";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
+import { Search, Plus, Building2, Trash2, Pencil, Users, Shield } from "lucide-react";
+import { entitiesService } from "@/services/entities.service";
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
import { useToast } from "@/hooks/use-toast";
+const ENTITY_TYPES = [
+ { value: "corporate", label: "Corporate" },
+ { value: "university", label: "University" },
+ { value: "school", label: "School" },
+ { value: "government", label: "Government" },
+ { value: "freelance", label: "Freelance" },
+];
+
export default function EntitiesPage() {
const [search, setSearch] = useState("");
const [createOpen, setCreateOpen] = useState(false);
- const [form, setForm] = useState({ name: "", code: "" });
+ const [editOpen, setEditOpen] = useState(false);
+ const [editEntity, setEditEntity] = useState<{ id: number; name: string; code: string; type: string } | null>(null);
+ const [form, setForm] = useState({ name: "", code: "", type: "" });
const { toast } = useToast();
+ const qc = useQueryClient();
- const deptsQ = useDepartments({ size: 200 });
- const createMut = useCreateDepartment();
- const deleteMut = useDeleteDepartment();
+ const entitiesQ = useQuery({
+ queryKey: ["entities"],
+ queryFn: () => entitiesService.list({ size: 200 }),
+ });
- const depts = deptsQ.data?.items ?? deptsQ.data?.data ?? [];
- const departments = Array.isArray(depts) ? depts : [];
- const filtered = departments.filter(d => d.name?.toLowerCase().includes(search.toLowerCase()));
- const loading = deptsQ.isLoading;
+ const createMut = useMutation({
+ mutationFn: (data: { name: string; code?: string; type?: string }) =>
+ entitiesService.create(data as Partial
+ {batches.length} total
{loading ? (
-
+
+
+
+
+
) : (
+
+
+
+
+
-
Entities / Departments
-Manage organizational departments.
+Entities
+Manage organizations and entities on the platform.
- => {
+ const st = getModuleState(mod);
+ const entityIdNum = st.entity && st.entity !== "" && st.entity !== "none"
+ ? Number(st.entity)
+ : undefined;
+ const entityObj = entityIdNum
+ ? entities.find((e) => e.id === entityIdNum)
+ : undefined;
+
+ let rubricIdNum: number | undefined;
+ if (st.rubricId && st.rubricId.startsWith("rubric-")) {
+ const parsed = Number(st.rubricId.split("-")[1]);
+ if (!Number.isNaN(parsed)) rubricIdNum = parsed;
+ }
+ const rubricObj = rubricIdNum
+ ? rubrics.find((r) => r.id === rubricIdNum)
+ : undefined;
+
+ const structureObj = selectedStructure;
+
+ return {
+ module: mod,
+ exam_mode: examMode,
+ exam_title: title || undefined,
+ exam_label: examLabel || undefined,
+ structure_name: structureObj?.name,
+ entity_id: entityIdNum,
+ entity_name: entityObj?.name,
+ rubric_id: rubricIdNum,
+ rubric_name: rubricObj?.name,
+ grading_system: st.gradingSystem || undefined,
+ access_type: st.accessType || undefined,
+ };
+ },
+ [getModuleState, entities, rubrics, selectedStructure, examMode, title, examLabel],
+ );
+
const generatePassageMut = useMutation({
- mutationFn: (params: { index: number; topic: string; difficulty: string; wordCount: number }) =>
+ mutationFn: (params: { index: number; topic: string; difficulty: string; wordCount: number; category: string; passageType: string }) =>
generationService.generatePassage({
+ ...buildPersonaContext(activeModule ?? "reading"),
topic: params.topic,
difficulty: params.difficulty,
word_count: params.wordCount,
+ category: params.category,
+ passage_type: params.passageType,
}),
onSuccess: (res, vars) => {
if (!activeModule) return;
@@ -463,19 +511,36 @@ export default function GenerationPage() {
types: string[];
typeCounts: Record;
typeInstructions: Record;
+ typeDifficulties?: Record;
passageText: string;
difficulty: string;
}) => {
const mod = params.module === "level" || params.module === "industry" ? "reading" : params.module;
const totalCount = Object.values(params.typeCounts).reduce((s, n) => s + n, 0);
+ const st = getModuleState(params.module);
+ let category: string | undefined;
+ let passageType: string | undefined;
+ if (params.module === "listening") {
+ const sec = st.listeningSections[params.passageIndex];
+ category = sec?.category;
+ passageType = sec?.type;
+ } else {
+ const p = st.passages[params.passageIndex];
+ category = p?.category;
+ passageType = p?.type;
+ }
return generationService.generateExercises(mod as "reading" | "listening" | "writing" | "speaking", {
+ ...buildPersonaContext(params.module),
passage_index: params.passageIndex,
exercise_types: params.types,
count_per_type: totalCount,
passage_text: params.passageText,
type_counts: params.typeCounts,
type_instructions: params.typeInstructions,
+ type_difficulties: params.typeDifficulties,
difficulty: params.difficulty,
+ category,
+ passage_type: passageType,
} as Record & { passage_index: number; exercise_types: string[] });
},
onSuccess: (res, vars) => {
@@ -536,8 +601,18 @@ export default function GenerationPage() {
});
const generateWritingMut = useMutation({
- mutationFn: (params: { topic: string; difficulty: string; taskIndex: number }) =>
- generationService.generateWritingInstructions({ topic: params.topic, difficulty: params.difficulty, task_type: "letter" }),
+ mutationFn: (params: { topic: string; difficulty: string; taskIndex: number }) => {
+ const st = getModuleState("writing");
+ const task = st.writingTasks[params.taskIndex];
+ return generationService.generateWritingInstructions({
+ ...buildPersonaContext("writing"),
+ topic: params.topic,
+ difficulty: params.difficulty,
+ task_type: task?.type || "essay",
+ category: task?.category || undefined,
+ word_limit: task?.wordLimit,
+ });
+ },
onSuccess: (res, vars) => {
const st = getModuleState("writing");
const tasks = [...st.writingTasks];
@@ -551,8 +626,17 @@ export default function GenerationPage() {
});
const generateSpeakingMut = useMutation({
- mutationFn: (params: { topics: string[]; difficulty: string; partIndex: number }) =>
- generationService.generateSpeakingScript({ topics: params.topics.filter(Boolean), difficulty: params.difficulty, part: "speaking_1" }),
+ mutationFn: (params: { topics: string[]; difficulty: string; partIndex: number }) => {
+ const st = getModuleState("speaking");
+ const part = st.speakingParts[params.partIndex];
+ return generationService.generateSpeakingScript({
+ ...buildPersonaContext("speaking"),
+ topics: params.topics.filter(Boolean),
+ difficulty: params.difficulty,
+ part: part?.type || "speaking_1",
+ category: part?.category || undefined,
+ });
+ },
onSuccess: (res, vars) => {
const r = res as Record;
if (r.error) {
@@ -874,7 +958,14 @@ export default function GenerationPage() {
}} />
+ {entities.length} total
{loading ? (
-
+
+
- ) : (
-
- {filtered.length === 0 &&
-
-
-
-
-
-
-
-
- ))}
+
+
+
+
+
+
)}
+ {/* Create Dialog */}
+
+ {/* Edit Dialog */}
+
);
}
diff --git a/src/pages/GenerationPage.tsx b/src/pages/GenerationPage.tsx
index 47c4679..92aa759 100644
--- a/src/pages/GenerationPage.tsx
+++ b/src/pages/GenerationPage.tsx
@@ -436,12 +436,60 @@ export default function GenerationPage() {
const currentState = activeModule ? getModuleState(activeModule) : null;
+ /**
+ * Build the rich "persona context" that the backend AI controller uses to
+ * build its system prompt. Every parameter the user has configured in the
+ * UI (exam mode, structure, entity, rubric, grading system, access type,
+ * passage category/type, module, subject) flows through here so the
+ * generated questions actually reflect those choices.
+ */
+ const buildPersonaContext = useCallback(
+ (mod: ModuleKey): RecordNo departments found.
} - {filtered.map((d) => ( -{d.code || "No code"}
-
+
+ ) : (
+