@appcorp/fusion-storybook 0.2.14 → 0.2.15

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

@@ -10,15 +10,20 @@ import { useMemo, useState } from "react";
 export const AttendanceMoreActions = ({ labelAttendanceStatus, labelCourse, labelCourseInfo, labelCoursePlaceholder, labelNoCourseFound, labelRemarks, labelRemarksInfo, labelRemarksPlaceholder, labelSearchCourses, labelStatusAbsent, labelStatusExcused, labelStatusHalfDay, labelStatusLate, labelStatusPresent, }) => {
     const enrollment = getCachedEnrollmentsSync().items;
     const studentProfiles = getCachedStudentProfilesSync().items;
+    const courses = getCachedCoursesSync().items;
     const [courseId, setCourseId] = useState("");
     const [remarks, setRemarks] = useState({});
     const [attendance, setAttendance] = useState({});
     const [errors] = useState({});
+    // Find the section for the selected course, then get students enrolled in that section
     const studentsInCourse = useMemo(() => {
+        const courseObj = courses.find((c) => c.id === courseId);
+        if (!courseObj)
+            return [];
         return enrollment
-            .filter((e) => e.courseId === courseId)
+            .filter((e) => e.sectionId === courseObj.sectionId)
             .map((e) => e.studentProfileId);
-    }, [enrollment, courseId]);
+    }, [enrollment, courseId, courses]);
     return (_jsxs("div", { className: "space-y-4", children: [_jsx(EnhancedCombobox, { emptyText: labelNoCourseFound, error: errors.courseId, id: "courseId", info: labelCourseInfo, label: labelCourse, onValueChange: (value) => setCourseId(value), options: getCachedCoursesSync().items.map((c) => ({
                     label: c.code.trim(),
                     value: c.id,

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

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

package/base-modules/enrollment/context.js

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

package/base-modules/enrollment/form.js

@@ -16,24 +16,20 @@ import { Separator } from "@appcorp/shadcn/components/ui/separator";
 import { DATE_FORMATS, formatDate } from "@react-pakistan/util-functions";
 import { useEnrollmentModule } from "./context";
 import { getCachedStudentProfilesSync } from "../student-profile/cache";
-import { getCachedCoursesSync } from "../course/cache";
 import { getCachedSectionsSync } from "../section/cache";
 import { useTranslations } from "next-intl";
 // ============================================================================
 // COMPONENT
 // ============================================================================
 export const EnrollmentForm = () => {
-    const { state: { courseId, enabled, enrollmentDate, errors, sectionId, studentProfileId, }, handleChange, } = useEnrollmentModule();
+    const { state: { enabled, enrollmentDate, errors, sectionId, studentProfileId, }, handleChange, } = useEnrollmentModule();
     const t = useTranslations("enrollment");
     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, {}), _jsx(EnhancedCombobox, { emptyText: t("formNoStudentEmpty"), error: errors.studentProfileId, id: "studentProfileId", info: t("formStudentInfo"), label: t("formStudentLabel"), onValueChange: (value) => handleChange("studentProfileId", value), options: (getCachedStudentProfilesSync().items || []).map((s) => ({
                     label: s.studentCode || s.id,
                     value: s.id,
-                })), placeholder: t("formStudentPlaceholder"), required: true, searchPlaceholder: t("formSearchStudentsPlaceholder"), value: studentProfileId || "" }), _jsx(EnhancedCombobox, { emptyText: t("formNoCourseEmpty"), error: errors.courseId, id: "courseId", info: t("formCourseInfo"), label: t("formCourseLabel"), onValueChange: (value) => handleChange("courseId", value), options: (getCachedCoursesSync().items || []).map((c) => ({
-                    label: c.code || c.id,
-                    value: c.id,
-                })), placeholder: t("formCoursePlaceholder"), required: true, searchPlaceholder: t("formSearchCoursesPlaceholder"), value: courseId || "" }), _jsx(EnhancedCombobox, { emptyText: t("formNoSectionEmpty"), error: errors.sectionId, id: "sectionId", info: t("sectionInfo"), label: t("section"), onValueChange: (value) => handleChange("sectionId", value), options: (getCachedSectionsSync().items || []).map((s) => {
+                })), placeholder: t("formStudentPlaceholder"), required: true, searchPlaceholder: t("formSearchStudentsPlaceholder"), value: studentProfileId || "" }), _jsx(EnhancedCombobox, { emptyText: t("formNoSectionEmpty"), error: errors.sectionId, id: "sectionId", info: t("sectionInfo"), label: t("section"), onValueChange: (value) => handleChange("sectionId", value), options: (getCachedSectionsSync().items || []).map((s) => {
                     var _a;
                     return ({
                         label: ((_a = s.class) === null || _a === void 0 ? void 0 : _a.code) ? `${s.class.code}-${s.name}` : s.name,

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

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

package/base-modules/enrollment/page.js

@@ -34,11 +34,6 @@ 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: "course",
-        textFormatter: (_, row) => { var _a, _b; return (_b = (_a = row.course) === null || _a === void 0 ? void 0 : _a.code) !== null && _b !== void 0 ? _b : "N/A"; },
-    },
     {
         componentType: COMPONENT_TYPE.TEXT,
         key: "section",
@@ -69,17 +64,16 @@ const createComponentInstances = () => ({
     moreActions: _jsx(EnrollmentMoreActions, {}),
     view: _jsx(EnrollmentView, {}),
 });
-const createEnrollmentConfig = ({ cancelLabel, dispatch, drawerFilterDescription, drawerFilterTitle, drawerFormDescription, drawerFormTitle, drawerMoreActionsDescription, drawerMoreActionsTitle, drawerViewDescription, drawerViewTitle, labelActions, labelCourse, labelEnabled, labelEnrollmentDate, labelId, labelSection, labelStudent, saveLabel, searchPlaceholder, tableDescription, tableTitle, }) => {
+const createEnrollmentConfig = ({ cancelLabel, dispatch, drawerFilterDescription, drawerFilterTitle, drawerFormDescription, drawerFormTitle, drawerMoreActionsDescription, drawerMoreActionsTitle, drawerViewDescription, drawerViewTitle, labelActions, labelEnabled, labelEnrollmentDate, labelId, labelSection, labelStudent, saveLabel, searchPlaceholder, tableDescription, tableTitle, }) => {
     const components = createComponentInstances();
     return {
         moduleName: "enrollment",
         tableColumns: [
             { label: labelId, width: "5%" },
-            { label: labelStudent, width: "20%" },
-            { label: labelCourse, width: "20%" },
-            { label: labelSection, width: "20%" },
-            { label: labelEnrollmentDate, width: "15%" },
-            { label: labelEnabled, width: "10%" },
+            { label: labelStudent, width: "25%" },
+            { label: labelSection, width: "25%" },
+            { label: labelEnrollmentDate, width: "20%" },
+            { label: labelEnabled, width: "15%" },
             { label: labelActions, width: "5%" },
         ],
         cancelLabel,
@@ -122,7 +116,6 @@ const EnrollmentPageInner = (props) => {
         drawerMoreActionsTitle: props.drawerMoreActionsTitle,
         drawerMoreActionsDescription: props.drawerMoreActionsDescription,
         labelActions: props.labelActions,
-        labelCourse: props.labelCourse,
         labelEnabled: props.labelEnabled,
         labelEnrollmentDate: props.labelEnrollmentDate,
         labelId: props.labelId,
@@ -144,7 +137,6 @@ const EnrollmentPageInner = (props) => {
         props.drawerMoreActionsTitle,
         props.drawerMoreActionsDescription,
         props.labelActions,
-        props.labelCourse,
         props.labelEnabled,
         props.labelEnrollmentDate,
         props.labelId,

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

@@ -6,7 +6,6 @@
 import { z } from "zod";
 export declare const enrollmentFormValidation: z.ZodObject<{
     studentProfileId: z.ZodString;
-    courseId: z.ZodString;
     sectionId: z.ZodString;
     enrollmentDate: z.ZodString;
     enabled: z.ZodOptional<z.ZodBoolean>;

package/base-modules/enrollment/validate.js

@@ -9,7 +9,6 @@ import { z } from "zod";
 // ============================================================================
 export const enrollmentFormValidation = z.object({
     studentProfileId: z.string().min(1, "Student is required"),
-    courseId: z.string().min(1, "Course is required"),
     sectionId: z.string().min(1, "Section is required"),
     enrollmentDate: z
         .string()

package/base-modules/enrollment/view.js

@@ -17,27 +17,24 @@ import { BookOpen, CheckCircle2, XCircle } from "lucide-react";
 import { DATE_FORMATS, formatDate } from "@react-pakistan/util-functions";
 import { useEnrollmentModule } from "./context";
 import { getCachedStudentProfilesSync } from "../student-profile/cache";
-import { getCachedCoursesSync } from "../course/cache";
 import { getCachedSectionsSync } from "../section/cache";
 import { useTranslations } from "next-intl";
 // ============================================================================
 // COMPONENT
 // ============================================================================
 export const EnrollmentView = memo(() => {
-    var _a, _b, _c, _d, _e;
-    const { state: { courseId, enrollmentDate, enabled, sectionId, studentProfileId }, } = useEnrollmentModule();
+    var _a, _b, _c;
+    const { state: { enrollmentDate, enabled, sectionId, studentProfileId }, } = useEnrollmentModule();
     const t = useTranslations("enrollment");
     const studentProfile = getCachedStudentProfilesSync().items.find((s) => s.id === studentProfileId);
     const studentName = (_b = (_a = studentProfile === null || studentProfile === void 0 ? void 0 : studentProfile.studentCode) !== null && _a !== void 0 ? _a : studentProfileId) !== null && _b !== void 0 ? _b : "—";
-    const course = getCachedCoursesSync().items.find((c) => c.id === courseId);
-    const courseName = (_d = (_c = course === null || course === void 0 ? void 0 : course.code) !== null && _c !== void 0 ? _c : courseId) !== null && _d !== void 0 ? _d : "—";
     const section = getCachedSectionsSync().items.find((s) => s.id === sectionId);
     const sectionName = section
-        ? ((_e = section.class) === null || _e === void 0 ? void 0 : _e.code)
+        ? ((_c = section.class) === null || _c === void 0 ? void 0 : _c.code)
             ? `${section.class.code}-${section.name}`
             : section.name
         : (sectionId !== null && sectionId !== void 0 ? sectionId : "—");
-    return (_jsxs("div", { className: "space-y-4", children: [_jsxs(Card, { children: [_jsxs(CardHeader, { className: "pb-3", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(BookOpen, { className: "h-5 w-5 text-primary" }), _jsx(CardTitle, { className: "text-lg", children: t("viewSectionEnrollmentDetails") })] }), _jsx(CardDescription, { children: t("viewSectionCompleteEnrollmentInformation") })] }), _jsx(Separator, {}), _jsx(CardContent, { className: "pt-6", children: _jsxs("div", { className: "grid grid-cols-1 gap-6", children: [_jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-sm font-medium text-muted-foreground", children: t("viewFieldStudent") }), _jsx("p", { className: "text-base", children: studentName })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-sm font-medium text-muted-foreground", children: t("viewFieldCourse") }), _jsx("p", { className: "text-base", children: courseName })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-sm font-medium text-muted-foreground", children: t("section") }), _jsx("p", { className: "text-base", children: sectionName })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-sm font-medium text-muted-foreground", children: t("viewFieldEnrollmentDate") }), _jsx("p", { className: "text-base", children: enrollmentDate
+    return (_jsxs("div", { className: "space-y-4", children: [_jsxs(Card, { children: [_jsxs(CardHeader, { className: "pb-3", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(BookOpen, { className: "h-5 w-5 text-primary" }), _jsx(CardTitle, { className: "text-lg", children: t("viewSectionEnrollmentDetails") })] }), _jsx(CardDescription, { children: t("viewSectionCompleteEnrollmentInformation") })] }), _jsx(Separator, {}), _jsx(CardContent, { className: "pt-6", children: _jsxs("div", { className: "grid grid-cols-1 gap-6", children: [_jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-sm font-medium text-muted-foreground", children: t("viewFieldStudent") }), _jsx("p", { className: "text-base", children: studentName })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-sm font-medium text-muted-foreground", children: t("section") }), _jsx("p", { className: "text-base", children: sectionName })] }), _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-sm font-medium text-muted-foreground", children: t("viewFieldEnrollmentDate") }), _jsx("p", { className: "text-base", children: enrollmentDate
                                                 ? formatDate(enrollmentDate, DATE_FORMATS.LOCALE_DATE)
                                                 : "—" })] })] }) })] }), _jsxs(Card, { children: [_jsxs(CardHeader, { className: "pb-3", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(BookOpen, { className: "h-5 w-5 text-primary" }), _jsx(CardTitle, { className: "text-lg", children: t("viewFieldStatus") })] }), _jsx(CardDescription, { children: t("viewFieldEnrollmentAvailability") })] }), _jsx(Separator, {}), _jsx(CardContent, { className: "pt-6", children: _jsx("div", { className: "grid grid-cols-1 gap-6", children: _jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-sm font-medium text-muted-foreground", children: t("viewFieldStatus") }), _jsx(Badge, { variant: enabled ? "default" : "destructive", className: "gap-1", children: enabled ? (_jsxs(_Fragment, { children: [_jsx(CheckCircle2, { className: "h-3 w-3" }), " ", t("viewFieldStatusActive")] })) : (_jsxs(_Fragment, { children: [_jsx(XCircle, { className: "h-3 w-3" }), " ", t("viewFieldStatusInactive")] })) })] }) }) })] })] }));
 });

package/base-modules/student-profile/constants.js

@@ -59,14 +59,18 @@ export const tableBodyCols = [
         componentType: COMPONENT_TYPE.TEXT,
         key: "enrollments",
         textFormatter: (value) => {
-            var _a;
+            var _a, _b, _c, _d;
             const enrollments = value;
             if (!enrollments || enrollments.length === 0)
                 return "No enrollments";
             if (enrollments.length === 1) {
-                return ((_a = enrollments[0].course) === null || _a === void 0 ? void 0 : _a.code) || "Unknown course";
+                const section = enrollments[0].section;
+                const courseCount = (_b = (_a = section === null || section === void 0 ? void 0 : section.courses) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
+                return courseCount > 0
+                    ? `${(_c = section === null || section === void 0 ? void 0 : section.name) !== null && _c !== void 0 ? _c : "Section"} (${courseCount} subjects)`
+                    : (_d = section === null || section === void 0 ? void 0 : section.name) !== null && _d !== void 0 ? _d : "Enrolled";
             }
-            return `${enrollments.length} courses`;
+            return `${enrollments.length} sections`;
         },
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/fusion-storybook",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "scripts": {
     "build-storybook": "storybook build",
     "build:next": "next build",