@appcorp/fusion-storybook 0.2.61 → 0.2.64

package/base-modules/class/more-actions.js

@@ -188,7 +188,7 @@ export const ClassMoreActions = () => {
                     showSuccessToast(t("messagesBulkSuccess"));
                 }
                 const schoolId = ((_f = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _f === void 0 ? void 0 : _f.id) || "";
-                fetch(`${CLASS_API_ROUTES.LIST}?currentPage=1&pageLimit=${pageLimit}&schoolId=${schoolId}`, {
+                fetch(`${CLASS_API_ROUTES.UNIT}?currentPage=1&pageLimit=${pageLimit}&schoolId=${schoolId}`, {
                     headers: {
                         "Content-Type": "application/json",
                     },

package/base-modules/course/context.d.ts

@@ -26,6 +26,8 @@ export declare const COURSE_ACTION_TYPES: {
     searchQuery: string;
     disableSaveButton: boolean;
     drawer: string | null;
+    classId: string;
+    classLabel: string;
     code: string;
     enabled: boolean;
     errors: Record<string, string>;
@@ -46,6 +48,8 @@ export declare const COURSE_ACTION_TYPES: {
     searchQuery: string;
     disableSaveButton: boolean;
     drawer: string | null;
+    classId: string;
+    classLabel: string;
     code: string;
     enabled: boolean;
     errors: Record<string, string>;
@@ -68,6 +72,8 @@ export declare const COURSE_ACTION_TYPES: {
     searchQuery: string;
     disableSaveButton: boolean;
     drawer: string | null;
+    classId: string;
+    classLabel: string;
     code: string;
     enabled: boolean;
     errors: Record<string, string>;
@@ -88,6 +94,8 @@ export declare const COURSE_ACTION_TYPES: {
     searchQuery: string;
     disableSaveButton: boolean;
     drawer: string | null;
+    classId: string;
+    classLabel: string;
     code: string;
     enabled: boolean;
     errors: Record<string, string>;
@@ -108,6 +116,8 @@ export declare const COURSE_ACTION_TYPES: {
     searchQuery: string;
     disableSaveButton: boolean;
     drawer: string | null;
+    classId: string;
+    classLabel: string;
     code: string;
     enabled: boolean;
     errors: Record<string, string>;
@@ -158,6 +168,8 @@ export declare const useCourseModule: () => {
         searchQuery: string;
         disableSaveButton: boolean;
         drawer: string | null;
+        classId: string;
+        classLabel: string;
         code: string;
         enabled: boolean;
         errors: Record<string, string>;

package/base-modules/course/context.js

@@ -54,6 +54,8 @@ const courseConfig = {
         disableSaveButton: false,
         drawer: null,
         // Form State
+        classId: "",
+        classLabel: "",
         code: "",
         enabled: true,
         errors: {},
@@ -102,6 +104,7 @@ export const useCourseModule = () => {
         schoolId,
     ]);
     const updateParams = useMemo(() => ({
+        classId: state.classId,
         code: state.code,
         enabled: state.enabled,
         id: state.id,
@@ -172,7 +175,7 @@ export const useCourseModule = () => {
         }
     }, [resetFormAndCloseDrawer, showToast, t]);
     const byIdCallback = useCallback(({ data, error }) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         if (error) {
             showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
             return;
@@ -183,13 +186,26 @@ export const useCourseModule = () => {
                 type: COURSE_ACTION_TYPES.SET_INPUT_FIELD,
                 payload: { key: "id", value: course.id },
             });
+            dispatch({
+                type: COURSE_ACTION_TYPES.SET_INPUT_FIELD,
+                payload: { key: "classId", value: course.classId },
+            });
+            dispatch({
+                type: COURSE_ACTION_TYPES.SET_INPUT_FIELD,
+                payload: {
+                    key: "classLabel",
+                    value: ((_a = course.class) === null || _a === void 0 ? void 0 : _a.name) && ((_b = course.class) === null || _b === void 0 ? void 0 : _b.code)
+                        ? `${course.class.name} (${course.class.code})`
+                        : course.classId,
+                },
+            });
             dispatch({
                 type: COURSE_ACTION_TYPES.SET_INPUT_FIELD,
                 payload: { key: "code", value: course.code },
             });
             dispatch({
                 type: COURSE_ACTION_TYPES.SET_INPUT_FIELD,
-                payload: { key: "enabled", value: (_a = course.enabled) !== null && _a !== void 0 ? _a : true },
+                payload: { key: "enabled", value: (_c = course.enabled) !== null && _c !== void 0 ? _c : true },
             });
             dispatch({
                 type: COURSE_ACTION_TYPES.SET_INPUT_FIELD,
@@ -203,9 +219,9 @@ export const useCourseModule = () => {
                 type: COURSE_ACTION_TYPES.SET_INPUT_FIELD,
                 payload: {
                     key: "sectionLabel",
-                    value: ((_c = (_b = course.section) === null || _b === void 0 ? void 0 : _b.class) === null || _c === void 0 ? void 0 : _c.code) && ((_d = course.section) === null || _d === void 0 ? void 0 : _d.name)
+                    value: ((_e = (_d = course.section) === null || _d === void 0 ? void 0 : _d.class) === null || _e === void 0 ? void 0 : _e.code) && ((_f = course.section) === null || _f === void 0 ? void 0 : _f.name)
                         ? `${course.section.class.code}-${course.section.name}`
-                        : ((_e = course.section) === null || _e === void 0 ? void 0 : _e.name) || course.sectionId,
+                        : ((_g = course.section) === null || _g === void 0 ? void 0 : _g.name) || course.sectionId,
                 },
             });
             dispatch({
@@ -216,7 +232,7 @@ export const useCourseModule = () => {
                 type: COURSE_ACTION_TYPES.SET_INPUT_FIELD,
                 payload: {
                     key: "subjectLabel",
-                    value: ((_f = course.subject) === null || _f === void 0 ? void 0 : _f.name) || course.subjectId,
+                    value: ((_h = course.subject) === null || _h === void 0 ? void 0 : _h.name) || course.subjectId,
                 },
             });
             dispatch({
@@ -227,8 +243,8 @@ export const useCourseModule = () => {
                 type: COURSE_ACTION_TYPES.SET_INPUT_FIELD,
                 payload: {
                     key: "teacherLabel",
-                    value: `${((_g = course.teacher) === null || _g === void 0 ? void 0 : _g.firstName) || ""} ${((_h = course.teacher) === null || _h === void 0 ? void 0 : _h.lastName) || ""}`.trim() ||
-                        ((_j = course.teacher) === null || _j === void 0 ? void 0 : _j.teacherCode) ||
+                    value: `${((_j = course.teacher) === null || _j === void 0 ? void 0 : _j.firstName) || ""} ${((_k = course.teacher) === null || _k === void 0 ? void 0 : _k.lastName) || ""}`.trim() ||
+                        ((_l = course.teacher) === null || _l === void 0 ? void 0 : _l.teacherCode) ||
                         course.teacherId,
                 },
             });

package/base-modules/course/form.js

@@ -10,7 +10,7 @@ import { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
 import { EnhancedCheckbox } from "@appcorp/shadcn/components/enhanced-checkbox";
 import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { useCourseModule } from "./context";
-import { SECTION_API_ROUTES, SUBJECT_API_ROUTES, TEACHER_API_ROUTES, } from "../../constants";
+import { CLASS_API_ROUTES, SECTION_API_ROUTES, SUBJECT_API_ROUTES, TEACHER_API_ROUTES, } from "../../constants";
 import { useTranslations } from "next-intl";
 import { useFetch } from "@react-pakistan/util-functions/hooks/use-fetch";
 import { API_METHODS } from "@react-pakistan/util-functions";
@@ -19,7 +19,11 @@ export const CourseForm = () => {
     const workspace = getCachedWorkspaceSync();
     const t = useTranslations("course");
     const { state, handleChange } = useCourseModule();
-    const { code, enabled, errors, sectionId, subjectId, teacherId } = state;
+    const { classId, code, enabled, errors, sectionId, subjectId, teacherId } = state;
+    const { data: classes } = useFetch("/api/v1/class", {
+        method: API_METHODS.GET,
+        params: { workspaceId: workspace === null || workspace === void 0 ? void 0 : workspace.id },
+    });
     const { data: sections } = useFetch("/api/v1/sections", {
         method: API_METHODS.GET,
         params: { workspaceId: workspace === null || workspace === void 0 ? void 0 : workspace.id },
@@ -32,6 +36,33 @@ export const CourseForm = () => {
         method: API_METHODS.GET,
         params: { workspaceId: workspace === null || workspace === void 0 ? void 0 : workspace.id },
     });
+    const { enhancedComboboxElement: classIdCombo } = useEnhancedCombobox({
+        emptyText: t("formNoClassEmpty"),
+        id: "classId",
+        info: t("formClassInfo"),
+        label: t("formClassLabel"),
+        onValueChange: (value) => {
+            var _a;
+            handleChange("classId", value);
+            handleChange("classLabel", ((_a = classes === null || classes === void 0 ? void 0 : classes.find((c) => c.id === value)) === null || _a === void 0 ? void 0 : _a.name) || "");
+        },
+        options: classes === null || classes === void 0 ? void 0 : classes.map((c) => ({
+            value: c.id,
+            label: `${c.name} (${c.code})`,
+        })),
+        placeholder: t("formClassPlaceholder"),
+        required: true,
+        searchEndpoint: CLASS_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchClassPlaceholder"),
+        formatSearchResult: (item) => {
+            var _a, _b;
+            return ({
+                label: String((_a = item.label) !== null && _a !== void 0 ? _a : ""),
+                value: String((_b = item.value) !== null && _b !== void 0 ? _b : ""),
+            });
+        },
+        value: classId,
+    });
     const { enhancedComboboxElement: sectionIdCombo } = useEnhancedCombobox({
         emptyText: t("formNoSectionEmpty"),
         id: "sectionId",
@@ -124,5 +155,5 @@ export const CourseForm = () => {
         },
         value: teacherId,
     });
-    return (_jsxs("div", { className: "space-y-4", children: [_jsx(EnhancedInput, { error: errors.code, id: "code", info: t("formCourseCodeInfo"), label: t("formCourseCodeLabel"), onChange: (e) => handleChange("code", e.target.value), placeholder: t("formCourseCodePlaceholder"), required: true, value: code }), sectionIdCombo, subjectIdCombo, teacherIdCombo, _jsx(EnhancedCheckbox, { label: t("formActiveCourseLabel"), defaultChecked: enabled, onCheckedChange: (checked) => handleChange("enabled", checked), info: t("actionToggleEnableOrDisableCourse") })] }));
+    return (_jsxs("div", { className: "space-y-4", children: [_jsx(EnhancedInput, { error: errors.code, id: "code", info: t("formCourseCodeInfo"), label: t("formCourseCodeLabel"), onChange: (e) => handleChange("code", e.target.value), placeholder: t("formCourseCodePlaceholder"), required: true, value: code }), classIdCombo, sectionIdCombo, subjectIdCombo, teacherIdCombo, _jsx(EnhancedCheckbox, { label: t("formActiveCourseLabel"), defaultChecked: enabled, onCheckedChange: (checked) => handleChange("enabled", checked), info: t("actionToggleEnableOrDisableCourse") })] }));
 };

package/base-modules/course/page.d.ts

@@ -24,6 +24,7 @@ interface Props {
     drawerViewDescription: string;
     drawerViewTitle: string;
     labelActions: string;
+    labelClass: string;
     labelCode: string;
     labelEnabled: string;
     labelId: string;

package/base-modules/course/page.js

@@ -29,6 +29,14 @@ import { RbacNoAccess } from "../../components/rbac-no-access";
 const tableBodyCols = [
     { componentType: COMPONENT_TYPE.ID, key: "id" },
     { componentType: COMPONENT_TYPE.TEXT, key: "code" },
+    {
+        componentType: COMPONENT_TYPE.TEXT,
+        key: "class",
+        textFormatter: (_, row) => {
+            const cls = row.class;
+            return cls ? `${cls.name} (${cls.code})` : "N/A";
+        },
+    },
     {
         componentType: COMPONENT_TYPE.TEXT,
         key: "section:name",
@@ -61,16 +69,17 @@ const createComponentInstances = () => ({
     moreActions: _jsx(CourseMoreActions, {}),
     view: _jsx(CourseView, {}),
 });
-const createCourseConfig = ({ cancelLabel, dispatch, drawerFilterDescription, drawerFilterTitle, drawerFormDescription, drawerFormTitle, drawerMoreActionsDescription, drawerMoreActionsTitle, drawerViewDescription, drawerViewTitle, labelActions, labelCode, labelEnabled, labelId, labelSection, labelSubject, labelTeacher, saveLabel, searchPlaceholder, tableDescription, tableTitle, }) => {
+const createCourseConfig = ({ cancelLabel, dispatch, drawerFilterDescription, drawerFilterTitle, drawerFormDescription, drawerFormTitle, drawerMoreActionsDescription, drawerMoreActionsTitle, drawerViewDescription, drawerViewTitle, labelActions, labelClass, labelCode, labelEnabled, labelId, labelSection, labelSubject, labelTeacher, saveLabel, searchPlaceholder, tableDescription, tableTitle, }) => {
     const components = createComponentInstances();
     return {
         moduleName: "course",
         tableColumns: [
             { label: labelId, width: "5%" },
-            { label: labelCode, width: "20%" },
-            { label: labelSection, width: "20%" },
-            { label: labelSubject, width: "20%" },
-            { label: labelTeacher, width: "20%" },
+            { label: labelCode, width: "15%" },
+            { label: labelClass, width: "15%" },
+            { label: labelSection, width: "15%" },
+            { label: labelSubject, width: "15%" },
+            { label: labelTeacher, width: "15%" },
             { label: labelEnabled, width: "10%" },
             { label: labelActions, width: "5%" },
         ],
@@ -114,6 +123,7 @@ const CoursePageInner = (props) => {
         drawerMoreActionsTitle: props.drawerMoreActionsTitle,
         drawerMoreActionsDescription: props.drawerMoreActionsDescription,
         labelActions: props.labelActions,
+        labelClass: props.labelClass,
         labelCode: props.labelCode,
         labelEnabled: props.labelEnabled,
         labelId: props.labelId,
@@ -136,6 +146,7 @@ const CoursePageInner = (props) => {
         props.drawerMoreActionsTitle,
         props.drawerMoreActionsDescription,
         props.labelActions,
+        props.labelClass,
         props.labelCode,
         props.labelEnabled,
         props.labelId,

package/base-modules/course/validate.d.ts

@@ -5,6 +5,7 @@
  */
 import { z } from "zod";
 export declare const courseFormValidation: z.ZodObject<{
+    classId: z.ZodString;
     code: z.ZodString;
     sectionId: z.ZodString;
     subjectId: z.ZodString;

package/base-modules/course/validate.js

@@ -8,6 +8,7 @@ import { z } from "zod";
 // VALIDATION SCHEMA
 // ============================================================================
 export const courseFormValidation = z.object({
+    classId: z.string().min(1, "Class is required"),
     code: z.string().min(1, "Course code is required"),
     sectionId: z.string().min(1, "Section is required"),
     subjectId: z.string().min(1, "Subject is required"),

package/base-modules/course/view.js

@@ -10,6 +10,7 @@ import { Badge } from "@appcorp/shadcn/components/ui/badge";
 import { Separator } from "@appcorp/shadcn/components/ui/separator";
 import { BookMarked, CheckCircle2, XCircle } from "lucide-react";
 import { useCourseModule } from "./context";
+import { getCachedClassesSync } from "../class/cache";
 import { getCachedSectionsSync } from "../section/cache";
 import { getCachedSubjectsSync } from "../subject/cache";
 import { getCachedTeachersSync } from "../teacher/cache";
@@ -19,10 +20,13 @@ export const CourseView = () => {
     var _a, _b, _c, _d, _e;
     const t = useTranslations("course");
     const { state } = useCourseModule();
-    const { code, enabled, sectionId, subjectId, teacherId } = state;
+    const { classId, code, enabled, sectionId, subjectId, teacherId } = state;
+    const classes = getCachedClassesSync().items;
     const sections = getCachedSectionsSync().items;
     const subjects = getCachedSubjectsSync().items;
     const teachers = getCachedTeachersSync().items;
+    const cls = classes.find((c) => c.id === classId);
+    const className = cls ? `${cls.name} (${cls.code})` : (classId !== null && classId !== void 0 ? classId : "—");
     const section = sections.find((s) => s.id === sectionId);
     const sectionName = section
         ? ((_a = section.class) === null || _a === void 0 ? void 0 : _a.code)
@@ -36,7 +40,7 @@ export const CourseView = () => {
             teacher.teacherCode ||
             "—"
         : "—";
-    return (_jsxs("div", { className: "space-y-4", children: [_jsx(Card, { children: _jsx(CardContent, { className: "pt-6", children: _jsxs("div", { className: "flex items-center gap-6", children: [_jsx("div", { className: "bg-primary/10 flex h-24 w-24 items-center justify-center rounded-full", children: _jsx(BookMarked, { className: "text-primary h-12 w-12" }) }), _jsxs("div", { className: "flex-1", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("h2", { className: "text-2xl font-bold", children: formatValue(code) }), enabled ? (_jsx(CheckCircle2, { className: "h-5 w-5 text-green-500" })) : (_jsx(XCircle, { className: "h-5 w-5 text-red-500" }))] }), _jsx("p", { className: "text-muted-foreground mt-1", children: sectionName })] })] }) }) }), _jsxs(Card, { children: [_jsxs(CardHeader, { className: "pb-3", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(BookMarked, { className: "text-primary h-5 w-5" }), _jsx(CardTitle, { className: "text-lg", children: t("viewSectionCourseDetails") })] }), _jsx(CardDescription, { children: t("viewSectionCompleteCourseInformation") })] }), _jsx(Separator, {}), _jsx(CardContent, { className: "pt-6", children: _jsxs("div", { className: "grid grid-cols-1 gap-6 md:grid-cols-2", children: [_jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("viewFieldCourseCode") }), _jsx("p", { className: "text-base", children: formatValue(code) })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("section") }), _jsx("p", { className: "text-base", children: sectionName })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("viewFieldSubject") }), _jsx("p", { className: "text-base", children: subjectName })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("viewFieldTeacher") }), _jsx("p", { className: "text-base", children: teacherName })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("viewFieldStatus") }), _jsx(Badge, { variant: enabled ? "default" : "secondary", children: enabled
+    return (_jsxs("div", { className: "space-y-4", children: [_jsx(Card, { children: _jsx(CardContent, { className: "pt-6", children: _jsxs("div", { className: "flex items-center gap-6", children: [_jsx("div", { className: "bg-primary/10 flex h-24 w-24 items-center justify-center rounded-full", children: _jsx(BookMarked, { className: "text-primary h-12 w-12" }) }), _jsxs("div", { className: "flex-1", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("h2", { className: "text-2xl font-bold", children: formatValue(code) }), enabled ? (_jsx(CheckCircle2, { className: "h-5 w-5 text-green-500" })) : (_jsx(XCircle, { className: "h-5 w-5 text-red-500" }))] }), _jsxs("p", { className: "text-muted-foreground mt-1", children: [className, " \u2014 ", sectionName] })] })] }) }) }), _jsxs(Card, { children: [_jsxs(CardHeader, { className: "pb-3", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(BookMarked, { className: "text-primary h-5 w-5" }), _jsx(CardTitle, { className: "text-lg", children: t("viewSectionCourseDetails") })] }), _jsx(CardDescription, { children: t("viewSectionCompleteCourseInformation") })] }), _jsx(Separator, {}), _jsx(CardContent, { className: "pt-6", children: _jsxs("div", { className: "grid grid-cols-1 gap-6 md:grid-cols-2", children: [_jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("viewFieldCourseCode") }), _jsx("p", { className: "text-base", children: formatValue(code) })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("labelClass") }), _jsx("p", { className: "text-base", children: className })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("section") }), _jsx("p", { className: "text-base", children: sectionName })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("viewFieldSubject") }), _jsx("p", { className: "text-base", children: subjectName })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("viewFieldTeacher") }), _jsx("p", { className: "text-base", children: teacherName })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-muted-foreground text-sm font-medium", children: t("viewFieldStatus") }), _jsx(Badge, { variant: enabled ? "default" : "secondary", children: enabled
                                                 ? t("viewFieldStatusActive")
                                                 : t("viewFieldStatusInactive") })] })] }) })] })] }));
 };

package/base-modules/enrollment/context.d.ts

@@ -1,5 +1,5 @@
 import { type RowAction, type TableRow } from "@appcorp/shadcn/components/enhanced-table";
-import { EnrollmentBE, SectionBE, StudentProfileBE } from "../../type";
+import { ClassBE, EnrollmentBE, SectionBE, StudentProfileBE } from "../../type";
 export declare const ENROLLMENT_DRAWER: {
     readonly FILTER_DRAWER: string;
     readonly FORM_DRAWER: string;
@@ -26,6 +26,7 @@ export declare const ENROLLMENT_ACTION_TYPES: {
     searchQuery: string;
     disableSaveButton: boolean;
     drawer: string | null;
+    classId: string;
     enabled: boolean;
     enrollmentDate: string;
     errors: Record<string, string>;
@@ -33,6 +34,7 @@ export declare const ENROLLMENT_ACTION_TYPES: {
     id: string;
     sectionId: string;
     studentProfileId: string;
+    class: ClassBE | undefined;
     section: SectionBE | undefined;
     studentProfile: StudentProfileBE | undefined;
 }>, initialEnrollmentState: {
@@ -43,6 +45,7 @@ export declare const ENROLLMENT_ACTION_TYPES: {
     searchQuery: string;
     disableSaveButton: boolean;
     drawer: string | null;
+    classId: string;
     enabled: boolean;
     enrollmentDate: string;
     errors: Record<string, string>;
@@ -50,6 +53,7 @@ export declare const ENROLLMENT_ACTION_TYPES: {
     id: string;
     sectionId: string;
     studentProfileId: string;
+    class: ClassBE | undefined;
     section: SectionBE | undefined;
     studentProfile: StudentProfileBE | undefined;
 }, EnrollmentProvider: import("react").FC<{
@@ -62,6 +66,7 @@ export declare const ENROLLMENT_ACTION_TYPES: {
     searchQuery: string;
     disableSaveButton: boolean;
     drawer: string | null;
+    classId: string;
     enabled: boolean;
     enrollmentDate: string;
     errors: Record<string, string>;
@@ -69,6 +74,7 @@ export declare const ENROLLMENT_ACTION_TYPES: {
     id: string;
     sectionId: string;
     studentProfileId: string;
+    class: ClassBE | undefined;
     section: SectionBE | undefined;
     studentProfile: StudentProfileBE | undefined;
 }, action: any) => {
@@ -79,6 +85,7 @@ export declare const ENROLLMENT_ACTION_TYPES: {
     searchQuery: string;
     disableSaveButton: boolean;
     drawer: string | null;
+    classId: string;
     enabled: boolean;
     enrollmentDate: string;
     errors: Record<string, string>;
@@ -86,6 +93,7 @@ export declare const ENROLLMENT_ACTION_TYPES: {
     id: string;
     sectionId: string;
     studentProfileId: string;
+    class: ClassBE | undefined;
     section: SectionBE | undefined;
     studentProfile: StudentProfileBE | undefined;
 }, useEnrollmentContext: () => import("@react-pakistan/util-functions/factory/generic-module-factory").GenericModuleContextWithHandlers<{
@@ -96,6 +104,7 @@ export declare const ENROLLMENT_ACTION_TYPES: {
     searchQuery: string;
     disableSaveButton: boolean;
     drawer: string | null;
+    classId: string;
     enabled: boolean;
     enrollmentDate: string;
     errors: Record<string, string>;
@@ -103,6 +112,7 @@ export declare const ENROLLMENT_ACTION_TYPES: {
     id: string;
     sectionId: string;
     studentProfileId: string;
+    class: ClassBE | undefined;
     section: SectionBE | undefined;
     studentProfile: StudentProfileBE | undefined;
 }>;
@@ -143,6 +153,7 @@ export declare const useEnrollmentModule: () => {
         searchQuery: string;
         disableSaveButton: boolean;
         drawer: string | null;
+        classId: string;
         enabled: boolean;
         enrollmentDate: string;
         errors: Record<string, string>;
@@ -150,6 +161,7 @@ export declare const useEnrollmentModule: () => {
         id: string;
         sectionId: string;
         studentProfileId: string;
+        class: ClassBE | undefined;
         section: SectionBE | undefined;
         studentProfile: StudentProfileBE | undefined;
     };

package/base-modules/enrollment/context.js

@@ -54,6 +54,7 @@ const enrollmentConfig = {
         disableSaveButton: false,
         drawer: null,
         // Form State
+        classId: "",
         enabled: true,
         enrollmentDate: new Date().toISOString().split("T")[0],
         errors: {},
@@ -62,6 +63,7 @@ const enrollmentConfig = {
         sectionId: "",
         studentProfileId: "",
         // Relations (populated from byId fetch)
+        class: undefined,
         section: undefined,
         studentProfile: undefined,
     },
@@ -100,6 +102,7 @@ export const useEnrollmentModule = () => {
         debouncedQuery,
     ]);
     const updateParams = useMemo(() => ({
+        classId: state.classId,
         enabled: state.enabled,
         enrollmentDate: state.enrollmentDate,
         id: state.id,

package/base-modules/enrollment/form.js

@@ -15,7 +15,7 @@ import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox
 import { Separator } from "@appcorp/shadcn/components/ui/separator";
 import { API_METHODS, DATE_FORMATS, formatDate, } from "@react-pakistan/util-functions";
 import { useEnrollmentModule } from "./context";
-import { SECTION_API_ROUTES, STUDENT_PROFILE_API_ROUTES, } from "../../constants";
+import { CLASS_API_ROUTES, SECTION_API_ROUTES, STUDENT_PROFILE_API_ROUTES, } from "../../constants";
 import { useTranslations } from "next-intl";
 import { useFetch } from "@react-pakistan/util-functions/hooks/use-fetch";
 import { useEffect } from "react";
@@ -24,13 +24,17 @@ import { getCachedWorkspaceSync } from "../workspace/cache";
 // COMPONENT
 // ============================================================================
 export const EnrollmentForm = () => {
-    const { state: { enabled, enrollmentDate, errors, sectionId, studentProfileId }, handleChange, } = useEnrollmentModule();
+    const { state: { classId, enabled, enrollmentDate, errors, sectionId, studentProfileId }, handleChange, } = useEnrollmentModule();
     const workspace = getCachedWorkspaceSync();
     const t = useTranslations("enrollment");
     const { fetchNow: studentProfileFetchNow, data: studentProfileData } = useFetch(STUDENT_PROFILE_API_ROUTES.UNIT, {
         method: API_METHODS.GET,
         params: { workspaceId: workspace === null || workspace === void 0 ? void 0 : workspace.id },
     });
+    const { fetchNow: classFetchNow, data: classData } = useFetch(CLASS_API_ROUTES.UNIT, {
+        method: API_METHODS.GET,
+        params: { workspaceId: workspace === null || workspace === void 0 ? void 0 : workspace.id },
+    });
     const { fetchNow: sectionFetchNow, data: sectionData } = useFetch(SECTION_API_ROUTES.UNIT, {
         method: API_METHODS.GET,
         params: { workspaceId: workspace === null || workspace === void 0 ? void 0 : workspace.id },
@@ -38,6 +42,7 @@ export const EnrollmentForm = () => {
     useEffect(() => {
         if (workspace === null || workspace === void 0 ? void 0 : workspace.id) {
             studentProfileFetchNow();
+            classFetchNow();
             sectionFetchNow();
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -69,6 +74,29 @@ export const EnrollmentForm = () => {
         },
         value: studentProfileId || "",
     });
+    const { enhancedComboboxElement: classIdCombo } = useEnhancedCombobox({
+        emptyText: t("formNoClassEmpty"),
+        id: "classId",
+        info: t("formClassInfo"),
+        label: t("formClassLabel"),
+        onValueChange: (value) => handleChange("classId", value),
+        options: ((classData === null || classData === void 0 ? void 0 : classData.items) || []).map((c) => ({
+            value: c.id,
+            label: `${c.name} (${c.code})`,
+        })),
+        placeholder: t("formClassPlaceholder"),
+        required: true,
+        searchEndpoint: CLASS_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchClassPlaceholder"),
+        formatSearchResult: (item) => {
+            const cls = Object.assign({}, item);
+            return {
+                label: `${cls.name} (${cls.code})`,
+                value: cls.id,
+            };
+        },
+        value: classId || "",
+    });
     const { enhancedComboboxElement: sectionIdCombo } = useEnhancedCombobox({
         emptyText: t("formNoSectionEmpty"),
         id: "sectionId",
@@ -98,5 +126,5 @@ export const EnrollmentForm = () => {
     });
     return (_jsxs("div", { className: "space-y-4", children: [_jsx(EnhancedInput, { error: errors.enrollmentDate, id: "enrollmentDate", info: t("formEnrollmentDateInfo"), label: t("formEnrollmentDateLabel"), onChange: (e) => handleChange("enrollmentDate", e.target.value), placeholder: t("formEnrollmentDatePlaceholder"), required: true, type: "date", value: enrollmentDate
                     ? formatDate(enrollmentDate, DATE_FORMATS.YYYY_MM_DD)
-                    : "" }), _jsx(Separator, {}), studentProfileIdCombo, sectionIdCombo, _jsx(EnhancedCheckbox, { checked: enabled, error: errors.enabled, id: "enabled", info: t("actionToggleEnableOrDisableEnrollment"), label: t("formActiveEnrollmentLabel"), onCheckedChange: (checked) => handleChange("enabled", checked) })] }));
+                    : "" }), _jsx(Separator, {}), studentProfileIdCombo, classIdCombo, sectionIdCombo, _jsx(EnhancedCheckbox, { checked: enabled, error: errors.enabled, id: "enabled", info: t("actionToggleEnableOrDisableEnrollment"), label: t("formActiveEnrollmentLabel"), onCheckedChange: (checked) => handleChange("enabled", checked) })] }));
 };

package/base-modules/enrollment/more-actions.js

@@ -91,7 +91,7 @@ export const EnrollmentMoreActions = () => {
         };
     }, []);
     const handleBulkFlow = useCallback(async (files, method) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const closeDrawer = () => {
             dispatch({
                 type: ENROLLMENT_ACTION_TYPES.SET_DRAWER,
@@ -120,13 +120,15 @@ export const EnrollmentMoreActions = () => {
             if (method === "POST") {
                 if (!((_b = row.studentProfileId) === null || _b === void 0 ? void 0 : _b.trim()))
                     msgs.push(t("validationRequiredStudentProfileId"));
-                if (!((_c = row.sectionId) === null || _c === void 0 ? void 0 : _c.trim()))
+                if (!((_c = row.classId) === null || _c === void 0 ? void 0 : _c.trim()))
+                    msgs.push(t("validationRequiredClassId"));
+                if (!((_d = row.sectionId) === null || _d === void 0 ? void 0 : _d.trim()))
                     msgs.push(t("validationRequiredSectionId"));
-                if (!((_d = row.enrollmentDate) === null || _d === void 0 ? void 0 : _d.trim()))
+                if (!((_e = row.enrollmentDate) === null || _e === void 0 ? void 0 : _e.trim()))
                     msgs.push(t("validationRequiredEnrollmentDate"));
             }
             else {
-                if (!((_e = row.id) === null || _e === void 0 ? void 0 : _e.trim()))
+                if (!((_f = row.id) === null || _f === void 0 ? void 0 : _f.trim()))
                     msgs.push(t("validationRequiredIdForUpdate"));
             }
             if (msgs.length > 0) {
@@ -169,7 +171,7 @@ export const EnrollmentMoreActions = () => {
                 return;
             if (status.status === "completed") {
                 const r = status.results;
-                if (r && ((_f = r.errors) === null || _f === void 0 ? void 0 : _f.length) > 0) {
+                if (r && ((_g = r.errors) === null || _g === void 0 ? void 0 : _g.length) > 0) {
                     const summary = formatErrorSummary(t, r.errors);
                     showSuccessToast(t("messagesBulkResults", {
                         created: r.created,
@@ -189,7 +191,7 @@ export const EnrollmentMoreActions = () => {
                 else {
                     showSuccessToast(t("messagesBulkSuccess"));
                 }
-                const schoolId = ((_g = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _g === void 0 ? void 0 : _g.id) || "";
+                const schoolId = ((_h = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _h === void 0 ? void 0 : _h.id) || "";
                 fetch(`${ENROLLMENT_API_ROUTES.LIST}?currentPage=1&pageLimit=${pageLimit}&schoolId=${schoolId}`, {
                     headers: {
                         "Content-Type": "application/json",
@@ -213,7 +215,7 @@ export const EnrollmentMoreActions = () => {
             }
             else {
                 const r = status.results;
-                const detail = ((_h = r === null || r === void 0 ? void 0 : r.errors) === null || _h === void 0 ? void 0 : _h.length)
+                const detail = ((_j = r === null || r === void 0 ? void 0 : r.errors) === null || _j === void 0 ? void 0 : _j.length)
                     ? formatErrorSummary(t, r.errors)
                     : t("unknownError");
                 showErrorToast(t("messagesBulkFailed", { action: label }) + "\n" + detail);

package/base-modules/enrollment/page.d.ts

@@ -24,6 +24,7 @@ interface Props {
     drawerViewDescription: string;
     drawerViewTitle: string;
     labelActions: string;
+    labelClass: string;
     labelEnabled: string;
     labelEnrollmentDate: string;
     labelId: string;

package/base-modules/enrollment/page.js

@@ -34,6 +34,14 @@ const tableBodyCols = [
         key: "studentProfile",
         textFormatter: (_, row) => { var _a, _b; return (_b = (_a = row.studentProfile) === null || _a === void 0 ? void 0 : _a.studentCode) !== null && _b !== void 0 ? _b : "N/A"; },
     },
+    {
+        componentType: COMPONENT_TYPE.TEXT,
+        key: "class",
+        textFormatter: (_, row) => {
+            const cls = row.class;
+            return cls ? `${cls.name} (${cls.code})` : "N/A";
+        },
+    },
     {
         componentType: COMPONENT_TYPE.TEXT,
         key: "section",
@@ -64,16 +72,17 @@ const createComponentInstances = () => ({
     moreActions: _jsx(EnrollmentMoreActions, {}),
     view: _jsx(EnrollmentView, {}),
 });
-const createEnrollmentConfig = ({ cancelLabel, dispatch, drawerFilterDescription, drawerFilterTitle, drawerFormDescription, drawerFormTitle, drawerMoreActionsDescription, drawerMoreActionsTitle, drawerViewDescription, drawerViewTitle, labelActions, labelEnabled, labelEnrollmentDate, labelId, labelSection, labelStudent, saveLabel, searchPlaceholder, tableDescription, tableTitle, }) => {
+const createEnrollmentConfig = ({ cancelLabel, dispatch, drawerFilterDescription, drawerFilterTitle, drawerFormDescription, drawerFormTitle, drawerMoreActionsDescription, drawerMoreActionsTitle, drawerViewDescription, drawerViewTitle, labelActions, labelClass, labelEnabled, labelEnrollmentDate, labelId, labelSection, labelStudent, saveLabel, searchPlaceholder, tableDescription, tableTitle, }) => {
     const components = createComponentInstances();
     return {
         moduleName: "enrollment",
         tableColumns: [
             { label: labelId, width: "5%" },
-            { label: labelStudent, width: "25%" },
-            { label: labelSection, width: "25%" },
+            { label: labelStudent, width: "20%" },
+            { label: labelClass, width: "15%" },
+            { label: labelSection, width: "20%" },
             { label: labelEnrollmentDate, width: "20%" },
-            { label: labelEnabled, width: "15%" },
+            { label: labelEnabled, width: "10%" },
             { label: labelActions, width: "5%" },
         ],
         cancelLabel,
@@ -116,6 +125,7 @@ const EnrollmentPageInner = (props) => {
         drawerMoreActionsTitle: props.drawerMoreActionsTitle,
         drawerMoreActionsDescription: props.drawerMoreActionsDescription,
         labelActions: props.labelActions,
+        labelClass: props.labelClass,
         labelEnabled: props.labelEnabled,
         labelEnrollmentDate: props.labelEnrollmentDate,
         labelId: props.labelId,
@@ -137,6 +147,7 @@ const EnrollmentPageInner = (props) => {
         props.drawerMoreActionsTitle,
         props.drawerMoreActionsDescription,
         props.labelActions,
+        props.labelClass,
         props.labelEnabled,
         props.labelEnrollmentDate,
         props.labelId,