@appcorp/fusion-storybook 0.2.40 → 0.2.42

package/base-modules/admission/constants.d.ts

@@ -7,26 +7,14 @@
  * - Table Configuration
  * - Status Options
  */
-import { ADMISSION_STATUS } from "../../type";
+import { ADMISSION_STATUS, GENDER } from "../../type";
 export declare const pageLimit: number;
 export declare const ADMISSION_API_ROUTES: Record<string, string>;
 export declare const ADMISSION_STATUS_OPTIONS: {
     label: string;
     value: ADMISSION_STATUS;
 }[];
-export declare const ADMISSION_STATUS_OPTIONS_CONST: readonly [{
-    readonly label: "Pending";
-    readonly value: ADMISSION_STATUS.PENDING;
-}, {
-    readonly label: "Approved";
-    readonly value: ADMISSION_STATUS.APPROVED;
-}, {
-    readonly label: "Rejected";
-    readonly value: ADMISSION_STATUS.REJECTED;
-}, {
-    readonly label: "Enrolled";
-    readonly value: ADMISSION_STATUS.ENROLLED;
-}, {
-    readonly label: "Cancelled";
-    readonly value: ADMISSION_STATUS.CANCELLED;
-}];
+export declare const GENDER_OPTIONS: {
+    label: string;
+    value: GENDER;
+}[];

package/base-modules/admission/constants.js

@@ -7,7 +7,7 @@
  * - Table Configuration
  * - Status Options
  */
-import { ADMISSION_STATUS } from "../../type";
+import { ADMISSION_STATUS, GENDER } from "../../type";
 // ============================================================================
 // PAGE CONFIGURATION
 // ============================================================================
@@ -28,10 +28,15 @@ export const ADMISSION_STATUS_OPTIONS = [
     { label: "Enrolled", value: ADMISSION_STATUS.ENROLLED },
     { label: "Cancelled", value: ADMISSION_STATUS.CANCELLED },
 ];
-export const ADMISSION_STATUS_OPTIONS_CONST = [
-    { label: "Pending", value: ADMISSION_STATUS.PENDING },
-    { label: "Approved", value: ADMISSION_STATUS.APPROVED },
-    { label: "Rejected", value: ADMISSION_STATUS.REJECTED },
-    { label: "Enrolled", value: ADMISSION_STATUS.ENROLLED },
-    { label: "Cancelled", value: ADMISSION_STATUS.CANCELLED },
+export const GENDER_OPTIONS = [
+    { label: "Male", value: GENDER.MALE },
+    { label: "Female", value: GENDER.FEMALE },
+    { label: "Other", value: GENDER.OTHER },
 ];
+// export const ADMISSION_STATUS_OPTIONS_CONST = [
+//   { label: "Pending", value: ADMISSION_STATUS.PENDING },
+//   { label: "Approved", value: ADMISSION_STATUS.APPROVED },
+//   { label: "Rejected", value: ADMISSION_STATUS.REJECTED },
+//   { label: "Enrolled", value: ADMISSION_STATUS.ENROLLED },
+//   { label: "Cancelled", value: ADMISSION_STATUS.CANCELLED },
+// ] as const;

package/base-modules/admission/context/use-admission-module.js

@@ -7,16 +7,12 @@ import { useModuleEntityV2, } from "@react-pakistan/util-functions/hooks/use-mod
 import { useDebounce } from "@react-pakistan/util-functions/hooks/use-debounce";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { ADMISSION_STATUS, GENDER, } from "../../../type";
-import { ADMISSION_API_ROUTES, pageLimit } from "../constants";
+import { ADMISSION_API_ROUTES } from "../constants";
 import { admissionFormValidation } from "../validate";
-import { getCachedAdmissions, invalidateAdmissionsCache } from "../cache";
 import { getCachedWorkspaceSync } from "../../workspace/cache";
 import { generateAdmissionReceiptPDF, } from "../../../utils/admission-pdf";
 import { formatNumber } from "@react-pakistan/util-functions/general/format-number";
 import { formatPhoneDisplay } from "@react-pakistan/util-functions/general/format-phone-display";
-import { invalidateFamiliesCache } from "../../family/cache";
-import { invalidateFamilyMembersCache } from "../../family-member/cache";
-import { invalidateStudentProfilesCache } from "../../student-profile/cache";
 import { Filter, Plus } from "lucide-react";
 import { ADMISSION_DRAWER, ADMISSION_ACTION_TYPES, useAdmissionContext, } from "../context";
 export const useAdmissionModule = () => {
@@ -130,12 +126,6 @@ export const useAdmissionModule = () => {
     ]);
     const byIdParams = useMemo(() => ({ id: state.id }), [state.id]);
     const deleteParams = useMemo(() => ({ id: state.id }), [state.id]);
-    const isDefaultListState = state.currentPage === 1 &&
-        state.pageLimit === pageLimit &&
-        !debouncedQuery &&
-        state.filterAdmissionStatus === undefined &&
-        state.filterStartDate === undefined &&
-        state.filterEndDate === undefined;
     // ============================================================================
     // 1.4.3 UTILITIES
     // ============================================================================
@@ -198,7 +188,6 @@ export const useAdmissionModule = () => {
             return;
         }
         if (data) {
-            invalidateAdmissionsCache();
             showToast(t("messagesSaveSuccess"), TOAST_VARIANT.SUCCESS);
             resetFormAndCloseDrawer();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
@@ -275,7 +264,6 @@ export const useAdmissionModule = () => {
             return;
         }
         if (data) {
-            invalidateAdmissionsCache();
             showToast(t("messagesDeleteSuccess"), TOAST_VARIANT.SUCCESS);
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
@@ -298,7 +286,6 @@ export const useAdmissionModule = () => {
         updateParams,
         headers: {
             "Content-Type": "application/json",
-            // "x-api-token": process.env.NEXT_PUBLIC_API_KEY!,
         },
     });
     // ============================================================================
@@ -339,7 +326,7 @@ export const useAdmissionModule = () => {
         });
     }, [dispatch, byIdFetchNow]);
     const handleDelete = useCallback((row) => {
-        if (!confirm(t("actionDeleteConfirmation")))
+        if (!confirm(t("messagesDeleteConfirmation")))
             return;
         deleteFetchNow === null || deleteFetchNow === void 0 ? void 0 : deleteFetchNow(undefined, {
             body: JSON.stringify({ id: row === null || row === void 0 ? void 0 : row.id }),
@@ -484,10 +471,6 @@ export const useAdmissionModule = () => {
             body: JSON.stringify({ admissionId: tableRow === null || tableRow === void 0 ? void 0 : tableRow.id }),
         });
         (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
-        invalidateAdmissionsCache();
-        invalidateFamiliesCache();
-        invalidateFamilyMembersCache();
-        invalidateStudentProfilesCache();
         if (data) {
             showToast(t("messagesAdmitSuccess"), TOAST_VARIANT.SUCCESS);
         }
@@ -548,7 +531,6 @@ export const useAdmissionModule = () => {
                 payload: { form: { aiAnalysis: result.aiAnalysis } },
             });
         }
-        invalidateAdmissionsCache();
         (_b = listFetchNowRef.current) === null || _b === void 0 ? void 0 : _b.call(listFetchNowRef);
         generateThemeToast({
             description: `${t("messagesAnalyzeSuccess")} ${(_c = result === null || result === void 0 ? void 0 : result.score) !== null && _c !== void 0 ? _c : "N/A"} — ${(_d = result === null || result === void 0 ? void 0 : result.status) !== null && _d !== void 0 ? _d : ""}`,
@@ -642,14 +624,14 @@ export const useAdmissionModule = () => {
         {
             enabled: true,
             handleOnClick: handleFilters,
-            label: t("actionHeaderFilters"),
+            label: t("actionsButtonFilters"),
             order: 1,
             icon: Filter,
         },
         {
             enabled: true,
             handleOnClick: handleCreate,
-            label: t("actionHeaderAddAdmission"),
+            label: t("actionsButtonAddAdmission"),
             order: 2,
             icon: Plus,
         },
@@ -658,39 +640,39 @@ export const useAdmissionModule = () => {
         {
             enabled: true,
             handleOnClick: handleView,
-            label: t("actionRowView"),
+            label: t("actionsButtonView"),
             order: 1,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.status) === ADMISSION_STATUS.PENDING,
             handleOnClick: handleEdit,
-            label: t("actionRowEdit"),
+            label: t("actionsButtonEdit"),
             order: 2,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.status) === ADMISSION_STATUS.PENDING,
             handleOnClick: handleDelete,
-            label: t("actionRowDelete"),
+            label: t("actionsButtonDelete"),
             order: 3,
             variant: "destructive",
         },
         {
             enabled: true,
             handleOnClick: handlePrint,
-            label: t("actionRowPrintPdf"),
+            label: t("actionsButtonPrintPdf"),
             order: 4,
         },
         {
             enabled: (row) => hasGeminiSecrets &&
                 (row === null || row === void 0 ? void 0 : row.status) === ADMISSION_STATUS.PENDING,
             handleOnClick: handleAnalyze,
-            label: t("actionRowAnalyzeWithAi"),
+            label: t("actionsButtonAnalyzeWithAi"),
             order: 5,
         },
         {
             enabled: (row) => (row === null || row === void 0 ? void 0 : row.status) !== ADMISSION_STATUS.APPROVED,
             handleOnClick: handleAddStudent,
-            label: t("actionRowAddStudent"),
+            label: t("actionsButtonAddStudent"),
             order: 6,
         },
     ], [
@@ -713,31 +695,12 @@ export const useAdmissionModule = () => {
     // ============================================================================
     // 1.4.9 EFFECTS
     // ============================================================================
-    // Initial load + re-fetch on page/search/filter change via cache
     useEffect(() => {
         var _a;
         if (!(workspace === null || workspace === void 0 ? void 0 : workspace.id))
             return;
-        if (isDefaultListState) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedAdmissions({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: ADMISSION_ACTION_TYPES.SET_ITEMS,
-                        payload: { items: items || [], count: count || 0 },
-                    });
-                }
-                catch (_a) {
-                    showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-                }
-            })();
-            return;
-        }
         (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
-    }, [dispatch, isDefaultListState, listParams, workspace === null || workspace === void 0 ? void 0 : workspace.id, t, showToast]);
-    // Sync ref to always point at latest listFetchNow (avoids stale closure in callbacks)
+    }, [listParams, workspace === null || workspace === void 0 ? void 0 : workspace.id]);
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
     }, [listFetchNow]);

package/base-modules/admission/filter.js

@@ -6,21 +6,41 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * Filter UI for admission records. Uses the module state pattern:
  * `const { state, handleChange, handleSetStartDate, handleSetEndDate } = useAdmissionModule()`
  */
-import { EnhancedCombobox } from "@appcorp/shadcn/components/enhanced-combobox";
+import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { EnhancedRadio } from "@appcorp/shadcn/components/enhanced-radio";
 import { useTranslations } from "next-intl";
-import { ADMISSION_STATUS_OPTIONS } from "./constants";
+import { ADMISSION_STATUS_OPTIONS, ADMISSION_API_ROUTES } from "./constants";
 import { useAdmissionModule } from "./context";
 export const AdmissionFilter = () => {
     const { state, handleChange, handleSetStartDate, handleSetEndDate } = useAdmissionModule();
     const { filterEnabled, filterAdmissionStatus, filterStartDate, filterEndDate, } = state;
     const t = useTranslations("admission");
+    const admissionStatusLabelMap = {
+        PENDING: t("formOptionPending"),
+        APPROVED: t("formOptionApproved"),
+        REJECTED: t("formOptionRejected"),
+        ENROLLED: t("formOptionEnrolled"),
+        CANCELLED: t("formOptionCancelled"),
+    };
     const filterEnabledValue = filterEnabled === undefined
         ? "undefined"
         : filterEnabled
             ? "true"
             : "false";
-    return (_jsx("div", { className: "space-y-4", children: _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedCombobox, { id: "filterAdmissionStatus", label: t("filterAdmissionStatusLabel"), info: t("filterByAdmissionStatus"), options: [...ADMISSION_STATUS_OPTIONS], value: filterAdmissionStatus !== null && filterAdmissionStatus !== void 0 ? filterAdmissionStatus : undefined, onValueChange: (value) => handleChange("filterAdmissionStatus", value) }), _jsxs("div", { children: [_jsx("label", { htmlFor: "startDate", className: "text-foreground mb-1 block text-sm font-medium", children: t("filterStartDateLabel") }), _jsx("input", { id: "startDate", type: "date", value: filterStartDate || "", onChange: (e) => handleSetStartDate(e.target.value), className: "border-input bg-background text-foreground focus:ring-ring w-full rounded-md border px-3 py-2 focus:border-transparent focus:ring-2 focus:outline-none" })] }), _jsxs("div", { children: [_jsx("label", { htmlFor: "endDate", className: "text-foreground mb-1 block text-sm font-medium", children: t("filterEndDateLabel") }), _jsx("input", { id: "endDate", type: "date", value: filterEndDate || "", onChange: (e) => handleSetEndDate(e.target.value), className: "border-input bg-background text-foreground focus:ring-ring w-full rounded-md border px-3 py-2 focus:border-transparent focus:ring-2 focus:outline-none" })] }), _jsx(EnhancedRadio, { label: t("filterOptionEnabled"), name: "filterEnabled", value: filterEnabledValue, options: [
+    const { enhancedComboboxElement: filterAdmissionStatusCombo } = useEnhancedCombobox({
+        id: "filterAdmissionStatus",
+        label: t("filterAdmissionStatusLabel"),
+        info: t("filterByAdmissionStatus"),
+        options: ADMISSION_STATUS_OPTIONS.map((opt) => ({
+            id: opt.value,
+            name: admissionStatusLabelMap[opt.value] || opt.label,
+        })),
+        value: filterAdmissionStatus || "",
+        onValueChange: (value) => handleChange("filterAdmissionStatus", value),
+        searchEndpoint: ADMISSION_API_ROUTES.UNIT,
+        placeholder: "",
+    });
+    return (_jsx("div", { className: "space-y-4", children: _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [filterAdmissionStatusCombo, _jsxs("div", { children: [_jsx("label", { htmlFor: "startDate", className: "text-foreground mb-1 block text-sm font-medium", children: t("filterStartDateLabel") }), _jsx("input", { id: "startDate", type: "date", value: filterStartDate || "", onChange: (e) => handleSetStartDate(e.target.value), className: "border-input bg-background text-foreground focus:ring-ring w-full rounded-md border px-3 py-2 focus:border-transparent focus:ring-2 focus:outline-none" })] }), _jsxs("div", { children: [_jsx("label", { htmlFor: "endDate", className: "text-foreground mb-1 block text-sm font-medium", children: t("filterEndDateLabel") }), _jsx("input", { id: "endDate", type: "date", value: filterEndDate || "", onChange: (e) => handleSetEndDate(e.target.value), className: "border-input bg-background text-foreground focus:ring-ring w-full rounded-md border px-3 py-2 focus:border-transparent focus:ring-2 focus:outline-none" })] }), _jsx(EnhancedRadio, { label: t("filterOptionEnabled"), name: "filterEnabled", value: filterEnabledValue, options: [
                         { label: t("filterOptionAll"), value: "undefined" },
                         { label: t("filterOptionEnabled"), value: "true" },
                         { label: t("filterOptionDisabled"), value: "false" },

package/base-modules/admission/form.js

@@ -12,31 +12,65 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
 import { EnhancedTextarea } from "@appcorp/shadcn/components/enhanced-textarea";
 import { EnhancedCheckbox } from "@appcorp/shadcn/components/enhanced-checkbox";
-import { EnhancedCombobox } from "@appcorp/shadcn/components/enhanced-combobox";
+import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { useAdmissionModule, ADMISSION_ACTION_TYPES } from "./context";
 import { Separator } from "@appcorp/shadcn/components/ui/separator";
-import { GENDER } from "../../type";
 import { useEffect } from "react";
 import { getCachedWorkspaceSync } from "../workspace/cache";
-import { getDialCode, VALUE_DELIMITER } from "@react-pakistan/util-functions";
+import { API_METHODS, getDialCode, VALUE_DELIMITER, } from "@react-pakistan/util-functions";
 import { v4 as uuidv4 } from "uuid";
-import { getCachedDiscountCodesSync } from "../discount-code/cache";
+import { ADMISSION_API_ROUTES, GENDER_OPTIONS } from "./constants";
 import { useTranslations } from "next-intl";
+import { useFetch } from "@react-pakistan/util-functions/hooks/use-fetch";
 export const AdmissionForm = () => {
     const { state, handleChange, dispatch } = useAdmissionModule();
     const { address, admissionNotes, studentIdNumber, city, classForAdmission, country, discountCode, dob, emergencyContact, errors, fatherIdNumber, fatherFirstName, fatherLastName, fatherMobile, fatherOccupation, fatherOrganization, firstName, gender, id, lastName, motherIdNumber, motherFirstName, motherLastName, motherMobile, notes, previousSchool, registrationCode, siblings, state: provinceState, } = state;
     const t = useTranslations("admission");
+    const genderLabelMap = {
+        MALE: t("formOptionMale"),
+        FEMALE: t("formOptionFemale"),
+        OTHER: t("formOptionOther"),
+    };
     const workspace = getCachedWorkspaceSync();
-    const discountCodes = getCachedDiscountCodesSync();
-    const discountCodeOptions = (discountCodes.items || [])
-        .filter((code) => code.enabled)
-        .map((code) => {
-        var _a;
-        return ({
-            label: `${code.code} - ${code.discountValue}${code.discountType === "PERCENTAGE" ? "%" : (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.currency}`,
-            value: code.code,
-            description: code.description || undefined,
-        });
+    const { data: discountCodes } = useFetch("/api/v1/discount-code", {
+        params: { workspaceId: workspace === null || workspace === void 0 ? void 0 : workspace.id },
+        method: API_METHODS.GET,
+    });
+    const { enhancedComboboxElement: genderCombo } = useEnhancedCombobox({
+        emptyText: t("formNoGenderOptionsEmpty"),
+        id: "gender",
+        info: t("formGenderInfo"),
+        label: t("formGenderLabel"),
+        required: true,
+        onValueChange: (value) => handleChange("gender", value),
+        options: GENDER_OPTIONS.map((g) => ({
+            id: g.value,
+            name: genderLabelMap[g.value] || g.label,
+        })),
+        placeholder: t("formGenderPlaceholder"),
+        searchEndpoint: ADMISSION_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchGenderPlaceholder"),
+        value: gender,
+    });
+    const { enhancedComboboxElement: discountCodeCombo } = useEnhancedCombobox({
+        emptyText: t("formNoDiscountCodesEmpty"),
+        id: "discountCode",
+        info: t("formDiscountCodeInfo"),
+        label: t("formDiscountCodeLabel"),
+        onValueChange: (value) => handleChange("discountCode", value),
+        options: ((discountCodes === null || discountCodes === void 0 ? void 0 : discountCodes.items) || [])
+            .filter((code) => code.enabled)
+            .map((code) => {
+            var _a;
+            return ({
+                id: code.code,
+                name: `${code.code} - ${code.discountValue}${code.discountType === "PERCENTAGE" ? "%" : (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.currency}`,
+            });
+        }),
+        placeholder: t("formDiscountCodePlaceholder"),
+        searchEndpoint: ADMISSION_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchDiscountCodesPlaceholder"),
+        value: discountCode || "",
     });
     useEffect(() => {
         var _a, _b, _c, _d, _e, _f;
@@ -79,9 +113,5 @@ export const AdmissionForm = () => {
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [id, dispatch]);
-    return (_jsxs("div", { className: "grid grid-cols-1 gap-2 space-y-2", children: [_jsx("h4", { className: "m-0 p-0", children: t("formSectionStudentInformation") }), _jsxs("div", { className: "grid grid-cols-5 gap-4", children: [_jsx(EnhancedInput, { error: errors.firstName, id: "firstName", info: t("formFirstNameInfo"), label: t("formFirstNameLabel"), onChange: (e) => handleChange("firstName", e.target.value), placeholder: t("formFirstNamePlaceholder"), required: true, type: "text", value: firstName || "" }), _jsx(EnhancedInput, { error: errors.lastName, id: "lastName", info: t("formLastNameInfo"), label: t("formLastNameLabel"), onChange: (e) => handleChange("lastName", e.target.value), placeholder: t("formLastNamePlaceholder"), required: true, type: "text", value: lastName || "" }), _jsx(EnhancedInput, { error: errors.studentIdNumber, id: "studentIdNumber", info: t("formStudentIdNumberInfo"), label: t("formStudentIdNumberLabel"), onChange: (e) => handleChange("studentIdNumber", e.target.value), placeholder: t("formStudentIdNumberPlaceholder"), required: true, type: "text", value: studentIdNumber || "" }), _jsx(EnhancedCombobox, { emptyText: t("formNoGenderOptionsEmpty"), error: errors.gender, id: "gender", info: t("formGenderInfo"), label: t("formGenderLabel"), required: true, onValueChange: (value) => handleChange("gender", value), options: [
-                            { label: t("formOptionMale"), value: GENDER.MALE },
-                            { label: t("formOptionFemale"), value: GENDER.FEMALE },
-                            { label: t("formOptionOther"), value: GENDER.OTHER },
-                        ], placeholder: t("formGenderPlaceholder"), searchPlaceholder: t("formSearchGenderPlaceholder"), value: gender }), _jsx(EnhancedInput, { error: errors.dob, id: "dob", info: t("formDobInfo"), label: t("formDobLabel"), onChange: (e) => handleChange("dob", e.target.value), placeholder: t("formDobPlaceholder"), required: true, type: "date", value: dob || "" }), _jsx(EnhancedInput, { error: errors.registrationCode, id: "registrationCode", info: t("formRegistrationCodeInfo"), label: t("formRegistrationCodeLabel"), onChange: (e) => handleChange("registrationCode", e.target.value), placeholder: t("formRegistrationCodePlaceholder"), required: true, type: "text", value: registrationCode || "", disabled: true }), _jsx(EnhancedCombobox, { emptyText: t("formNoDiscountCodesEmpty"), error: errors.discountCode, id: "discountCode", info: t("formDiscountCodeInfo"), label: t("formDiscountCodeLabel"), onValueChange: (value) => handleChange("discountCode", value), options: discountCodeOptions, placeholder: t("formDiscountCodePlaceholder"), searchPlaceholder: t("formSearchDiscountCodesPlaceholder"), value: discountCode || "" }), _jsx(EnhancedCheckbox, { label: t("formCheckboxHafizLabel"), id: "hafiz", info: t("formHafizInfo"), onCheckedChange: (checked) => handleChange("hafiz", checked) }), _jsx(EnhancedCheckbox, { label: t("formCheckboxOrphanLabel"), id: "orphan", info: t("formOrphanInfo"), onCheckedChange: (checked) => handleChange("orphan", checked) })] }), _jsx(Separator, {}), _jsx("h4", { className: "m-0 p-0", children: t("formSectionFatherInformation") }), _jsxs("div", { className: "grid grid-cols-6 gap-4", children: [_jsx(EnhancedInput, { error: errors.fatherFirstName, id: "fatherFirstName", info: t("formFatherFirstNameInfo"), label: t("formFirstNameLabel"), onChange: (e) => handleChange("fatherFirstName", e.target.value), placeholder: t("formFirstNamePlaceholder"), required: true, type: "text", value: fatherFirstName || "" }), _jsx(EnhancedInput, { error: errors.fatherLastName, id: "fatherLastName", info: t("formFatherLastNameInfo"), label: t("formLastNameLabel"), onChange: (e) => handleChange("fatherLastName", e.target.value), placeholder: t("formLastNamePlaceholder"), required: true, type: "text", value: fatherLastName || "" }), _jsx(EnhancedInput, { error: errors.fatherIdNumber, id: "fatherIdNumber", info: t("formFatherIdNumberInfo"), label: t("formIdNumberLabel"), onChange: (e) => handleChange("fatherIdNumber", e.target.value), placeholder: t("formIDNumberPlaceholder"), required: true, type: "text", value: fatherIdNumber || "" }), _jsx(EnhancedInput, { error: errors.fatherMobile, id: "fatherMobile", info: t("formFatherMobileInfo"), label: t("formMobileLabel"), onChange: (e) => handleChange("fatherMobile", e.target.value), placeholder: "+923001234567", required: true, type: "text", value: fatherMobile || "" }), _jsx(EnhancedInput, { error: errors.fatherOccupation, id: "fatherOccupation", info: t("formFatherOccupationInfo"), label: t("formOccupationLabel"), onChange: (e) => handleChange("fatherOccupation", e.target.value), placeholder: t("formOccupationPlaceholder"), required: false, type: "text", value: fatherOccupation || "" }), _jsx(EnhancedInput, { error: errors.fatherOrganization, id: "fatherOrganization", info: t("formFatherOrganizationInfo"), label: t("formOrganizationLabel"), onChange: (e) => handleChange("fatherOrganization", e.target.value), placeholder: t("formOrganizationPlaceholder"), required: false, type: "text", value: fatherOrganization || "" }), _jsx(EnhancedCheckbox, { label: t("formEmergencyContactLabel"), id: "emergencyContactFather", info: t("formFatherEmergencyContactInfo"), checked: emergencyContact === "Father", onCheckedChange: (checked) => handleChange("emergencyContact", checked ? "Father" : "") })] }), _jsx(Separator, {}), _jsx("h4", { className: "m-0 p-0", children: t("formSectionMotherInformation") }), _jsxs("div", { className: "grid grid-cols-6 gap-4", children: [_jsx(EnhancedInput, { error: errors.motherFirstName, id: "motherFirstName", info: t("formMotherFirstNameInfo"), label: t("formFirstNameLabel"), onChange: (e) => handleChange("motherFirstName", e.target.value), placeholder: t("formFirstNamePlaceholder"), required: true, type: "text", value: motherFirstName || "" }), _jsx(EnhancedInput, { error: errors.motherLastName, id: "motherLastName", info: t("formMotherLastNameInfo"), label: t("formLastNameLabel"), onChange: (e) => handleChange("motherLastName", e.target.value), placeholder: t("formLastNamePlaceholder"), required: true, type: "text", value: motherLastName || "" }), _jsx(EnhancedInput, { error: errors.motherIdNumber, id: "motherIdNumber", info: t("formMotherIdNumberInfo"), label: t("formIdNumberLabel"), onChange: (e) => handleChange("motherIdNumber", e.target.value), placeholder: t("formIDNumberPlaceholder"), required: true, type: "text", value: motherIdNumber || "" }), _jsx(EnhancedInput, { error: errors.motherMobile, id: "motherMobile", info: t("formMotherMobileInfo"), label: t("formMobileLabel"), onChange: (e) => handleChange("motherMobile", e.target.value), placeholder: "+923001234567", required: true, type: "text", value: motherMobile || "" }), _jsx(EnhancedCheckbox, { label: t("formEmergencyContactLabel"), id: "emergencyContactMother", info: t("formMotherEmergencyContactInfo"), checked: emergencyContact === "Mother", onCheckedChange: (checked) => handleChange("emergencyContact", checked ? "Mother" : "") })] }), _jsx(Separator, {}), _jsx("h4", { className: "m-0 p-0", children: t("formSectionHomeInformation") }), _jsxs("div", { className: "grid grid-cols-6 gap-4", children: [_jsx(EnhancedTextarea, { error: errors.address, id: "homeAddress", info: t("formHomeAddressInfo"), label: t("formHomeAddressLabel"), onChange: (e) => handleChange("address", e.target.value), placeholder: t("formHomeAddressPlaceholder"), required: true, rows: 2, value: address || "" }), _jsx(EnhancedInput, { error: errors.city, id: "city", info: t("formCityInfo"), label: t("formCityLabel"), onChange: (e) => handleChange("city", e.target.value), placeholder: t("formCityPlaceholder"), required: true, type: "text", value: city || "" }), _jsx(EnhancedInput, { error: errors.state, id: "state", info: t("formStateInfo"), label: t("formStateLabel"), onChange: (e) => handleChange("state", e.target.value), placeholder: t("formStatePlaceholder"), required: true, type: "text", value: provinceState || "" }), _jsx(EnhancedInput, { error: errors.country, id: "country", info: t("formCountryInfo"), label: t("formCountryLabel"), onChange: (e) => handleChange("country", e.target.value), placeholder: t("formCountryPlaceholder"), required: true, type: "text", value: country || "" })] }), _jsx(Separator, {}), _jsx("h4", { className: "m-0 p-0", children: t("formSectionAdmissionInformation") }), _jsxs("div", { className: "grid grid-cols-6 gap-4", children: [_jsx(EnhancedInput, { error: errors.classForAdmission, id: "classForAdmission", info: t("formClassForAdmissionInfo"), label: t("formClassForAdmissionLabel"), onChange: (e) => handleChange("classForAdmission", e.target.value), placeholder: t("formClassForAdmissionPlaceholder"), required: true, type: "text", value: classForAdmission || "" }), _jsx(EnhancedInput, { error: errors.previousSchool, id: "previousSchool", info: t("formPreviousSchoolInfo"), label: t("formPreviousSchoolLabel"), onChange: (e) => handleChange("previousSchool", e.target.value), placeholder: t("formPreviousSchoolPlaceholder"), type: "text", value: previousSchool || "" }), _jsx(EnhancedTextarea, { error: errors.siblings, id: "siblings", info: t("formSiblingsInfo"), label: t("formSiblingsLabel"), onChange: (e) => handleChange("siblings", e.target.value), placeholder: t("formSiblingsPlaceholder"), rows: 3, value: siblings || "" })] }), _jsx(Separator, {}), _jsx("h4", { className: "m-0 p-0", children: t("formSectionOfficeUse") }), _jsxs("div", { className: "grid grid-cols-4 gap-4", children: [_jsx(EnhancedTextarea, { error: errors.notes, id: "notes", info: t("formNotesInfo"), label: t("formNotesLabel"), onChange: (e) => handleChange("notes", e.target.value), placeholder: t("formNotesPlaceholder"), rows: 3, value: notes || "" }), _jsx(EnhancedTextarea, { error: errors.admissionNotes, id: "admissionNotes", info: t("formAdmissionNotesInfo"), label: t("formAdmissionNotesLabel"), onChange: (e) => handleChange("admissionNotes", e.target.value), placeholder: t("formAdmissionNotesPlaceholder"), rows: 3, value: admissionNotes || "" })] })] }));
+    return (_jsxs("div", { className: "grid grid-cols-1 gap-2 space-y-2", children: [_jsx("h4", { className: "m-0 p-0", children: t("formSectionStudentInformation") }), _jsxs("div", { className: "grid grid-cols-5 gap-4", children: [_jsx(EnhancedInput, { error: errors.firstName, id: "firstName", info: t("formFirstNameInfo"), label: t("formFirstNameLabel"), onChange: (e) => handleChange("firstName", e.target.value), placeholder: t("formFirstNamePlaceholder"), required: true, type: "text", value: firstName || "" }), _jsx(EnhancedInput, { error: errors.lastName, id: "lastName", info: t("formLastNameInfo"), label: t("formLastNameLabel"), onChange: (e) => handleChange("lastName", e.target.value), placeholder: t("formLastNamePlaceholder"), required: true, type: "text", value: lastName || "" }), _jsx(EnhancedInput, { error: errors.studentIdNumber, id: "studentIdNumber", info: t("formStudentIdNumberInfo"), label: t("formStudentIdNumberLabel"), onChange: (e) => handleChange("studentIdNumber", e.target.value), placeholder: t("formStudentIdNumberPlaceholder"), required: true, type: "text", value: studentIdNumber || "" }), genderCombo, _jsx(EnhancedInput, { error: errors.dob, id: "dob", info: t("formDobInfo"), label: t("formDobLabel"), onChange: (e) => handleChange("dob", e.target.value), placeholder: t("formDobPlaceholder"), required: true, type: "date", value: dob || "" }), _jsx(EnhancedInput, { error: errors.registrationCode, id: "registrationCode", info: t("formRegistrationCodeInfo"), label: t("formRegistrationCodeLabel"), onChange: (e) => handleChange("registrationCode", e.target.value), placeholder: t("formRegistrationCodePlaceholder"), required: true, type: "text", value: registrationCode || "", disabled: true }), discountCodeCombo, _jsx(EnhancedCheckbox, { label: t("formCheckboxHafizLabel"), id: "hafiz", info: t("formHafizInfo"), onCheckedChange: (checked) => handleChange("hafiz", checked) }), _jsx(EnhancedCheckbox, { label: t("formCheckboxOrphanLabel"), id: "orphan", info: t("formOrphanInfo"), onCheckedChange: (checked) => handleChange("orphan", checked) })] }), _jsx(Separator, {}), _jsx("h4", { className: "m-0 p-0", children: t("formSectionFatherInformation") }), _jsxs("div", { className: "grid grid-cols-6 gap-4", children: [_jsx(EnhancedInput, { error: errors.fatherFirstName, id: "fatherFirstName", info: t("formFatherFirstNameInfo"), label: t("formFirstNameLabel"), onChange: (e) => handleChange("fatherFirstName", e.target.value), placeholder: t("formFirstNamePlaceholder"), required: true, type: "text", value: fatherFirstName || "" }), _jsx(EnhancedInput, { error: errors.fatherLastName, id: "fatherLastName", info: t("formFatherLastNameInfo"), label: t("formLastNameLabel"), onChange: (e) => handleChange("fatherLastName", e.target.value), placeholder: t("formLastNamePlaceholder"), required: true, type: "text", value: fatherLastName || "" }), _jsx(EnhancedInput, { error: errors.fatherIdNumber, id: "fatherIdNumber", info: t("formFatherIdNumberInfo"), label: t("formIdNumberLabel"), onChange: (e) => handleChange("fatherIdNumber", e.target.value), placeholder: t("formIDNumberPlaceholder"), required: true, type: "text", value: fatherIdNumber || "" }), _jsx(EnhancedInput, { error: errors.fatherMobile, id: "fatherMobile", info: t("formFatherMobileInfo"), label: t("formMobileLabel"), onChange: (e) => handleChange("fatherMobile", e.target.value), placeholder: "+923001234567", required: true, type: "text", value: fatherMobile || "" }), _jsx(EnhancedInput, { error: errors.fatherOccupation, id: "fatherOccupation", info: t("formFatherOccupationInfo"), label: t("formOccupationLabel"), onChange: (e) => handleChange("fatherOccupation", e.target.value), placeholder: t("formOccupationPlaceholder"), required: false, type: "text", value: fatherOccupation || "" }), _jsx(EnhancedInput, { error: errors.fatherOrganization, id: "fatherOrganization", info: t("formFatherOrganizationInfo"), label: t("formOrganizationLabel"), onChange: (e) => handleChange("fatherOrganization", e.target.value), placeholder: t("formOrganizationPlaceholder"), required: false, type: "text", value: fatherOrganization || "" }), _jsx(EnhancedCheckbox, { label: t("formEmergencyContactLabel"), id: "emergencyContactFather", info: t("formFatherEmergencyContactInfo"), checked: emergencyContact === "Father", onCheckedChange: (checked) => handleChange("emergencyContact", checked ? "Father" : "") })] }), _jsx(Separator, {}), _jsx("h4", { className: "m-0 p-0", children: t("formSectionMotherInformation") }), _jsxs("div", { className: "grid grid-cols-6 gap-4", children: [_jsx(EnhancedInput, { error: errors.motherFirstName, id: "motherFirstName", info: t("formMotherFirstNameInfo"), label: t("formFirstNameLabel"), onChange: (e) => handleChange("motherFirstName", e.target.value), placeholder: t("formFirstNamePlaceholder"), required: true, type: "text", value: motherFirstName || "" }), _jsx(EnhancedInput, { error: errors.motherLastName, id: "motherLastName", info: t("formMotherLastNameInfo"), label: t("formLastNameLabel"), onChange: (e) => handleChange("motherLastName", e.target.value), placeholder: t("formLastNamePlaceholder"), required: true, type: "text", value: motherLastName || "" }), _jsx(EnhancedInput, { error: errors.motherIdNumber, id: "motherIdNumber", info: t("formMotherIdNumberInfo"), label: t("formIdNumberLabel"), onChange: (e) => handleChange("motherIdNumber", e.target.value), placeholder: t("formIDNumberPlaceholder"), required: true, type: "text", value: motherIdNumber || "" }), _jsx(EnhancedInput, { error: errors.motherMobile, id: "motherMobile", info: t("formMotherMobileInfo"), label: t("formMobileLabel"), onChange: (e) => handleChange("motherMobile", e.target.value), placeholder: "+923001234567", required: true, type: "text", value: motherMobile || "" }), _jsx(EnhancedCheckbox, { label: t("formEmergencyContactLabel"), id: "emergencyContactMother", info: t("formMotherEmergencyContactInfo"), checked: emergencyContact === "Mother", onCheckedChange: (checked) => handleChange("emergencyContact", checked ? "Mother" : "") })] }), _jsx(Separator, {}), _jsx("h4", { className: "m-0 p-0", children: t("formSectionHomeInformation") }), _jsxs("div", { className: "grid grid-cols-6 gap-4", children: [_jsx(EnhancedTextarea, { error: errors.address, id: "homeAddress", info: t("formHomeAddressInfo"), label: t("formHomeAddressLabel"), onChange: (e) => handleChange("address", e.target.value), placeholder: t("formHomeAddressPlaceholder"), required: true, rows: 2, value: address || "" }), _jsx(EnhancedInput, { error: errors.city, id: "city", info: t("formCityInfo"), label: t("formCityLabel"), onChange: (e) => handleChange("city", e.target.value), placeholder: t("formCityPlaceholder"), required: true, type: "text", value: city || "" }), _jsx(EnhancedInput, { error: errors.state, id: "state", info: t("formStateInfo"), label: t("formStateLabel"), onChange: (e) => handleChange("state", e.target.value), placeholder: t("formStatePlaceholder"), required: true, type: "text", value: provinceState || "" }), _jsx(EnhancedInput, { error: errors.country, id: "country", info: t("formCountryInfo"), label: t("formCountryLabel"), onChange: (e) => handleChange("country", e.target.value), placeholder: t("formCountryPlaceholder"), required: true, type: "text", value: country || "" })] }), _jsx(Separator, {}), _jsx("h4", { className: "m-0 p-0", children: t("formSectionAdmissionInformation") }), _jsxs("div", { className: "grid grid-cols-6 gap-4", children: [_jsx(EnhancedInput, { error: errors.classForAdmission, id: "classForAdmission", info: t("formClassForAdmissionInfo"), label: t("formClassForAdmissionLabel"), onChange: (e) => handleChange("classForAdmission", e.target.value), placeholder: t("formClassForAdmissionPlaceholder"), required: true, type: "text", value: classForAdmission || "" }), _jsx(EnhancedInput, { error: errors.previousSchool, id: "previousSchool", info: t("formPreviousSchoolInfo"), label: t("formPreviousSchoolLabel"), onChange: (e) => handleChange("previousSchool", e.target.value), placeholder: t("formPreviousSchoolPlaceholder"), type: "text", value: previousSchool || "" }), _jsx(EnhancedTextarea, { error: errors.siblings, id: "siblings", info: t("formSiblingsInfo"), label: t("formSiblingsLabel"), onChange: (e) => handleChange("siblings", e.target.value), placeholder: t("formSiblingsPlaceholder"), rows: 3, value: siblings || "" })] }), _jsx(Separator, {}), _jsx("h4", { className: "m-0 p-0", children: t("formSectionOfficeUse") }), _jsxs("div", { className: "grid grid-cols-4 gap-4", children: [_jsx(EnhancedTextarea, { error: errors.notes, id: "notes", info: t("formNotesInfo"), label: t("formNotesLabel"), onChange: (e) => handleChange("notes", e.target.value), placeholder: t("formNotesPlaceholder"), rows: 3, value: notes || "" }), _jsx(EnhancedTextarea, { error: errors.admissionNotes, id: "admissionNotes", info: t("formAdmissionNotesInfo"), label: t("formAdmissionNotesLabel"), onChange: (e) => handleChange("admissionNotes", e.target.value), placeholder: t("formAdmissionNotesPlaceholder"), rows: 3, value: admissionNotes || "" })] })] }));
 };

package/base-modules/attendance/context.js

@@ -25,7 +25,6 @@ import { useDebounce } from "@react-pakistan/util-functions/hooks/use-debounce";
 import { createGenericModule } from "@react-pakistan/util-functions/factory/generic-module-factory";
 import { DRAWER_TYPES } from "@react-pakistan/util-functions/factory/generic-component-factory";
 import { ATTENDANCE_API_ROUTES, pageLimit } from "./constants";
-import { getCachedAttendances, invalidateAttendancesCache } from "./cache";
 import { attendanceFormValidation } from "./validate";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
 import { ATTENDANCE_STATUS, } from "../../type";
@@ -168,7 +167,6 @@ export const useAttendanceModule = () => {
             showToast(isCreatedOrUpdated(data)
                 ? t("messagesAttendanceCreated")
                 : t("messagesAttendanceUpdated"), TOAST_VARIANT.SUCCESS);
-            invalidateAttendancesCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
             resetFormAndCloseDrawer();
         }
@@ -193,7 +191,6 @@ export const useAttendanceModule = () => {
         }
         if (data) {
             showToast(t("messagesAttendanceDeleted"), TOAST_VARIANT.SUCCESS);
-            invalidateAttendancesCache();
             (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
         }
     }, [showToast, t]);
@@ -397,44 +394,13 @@ export const useAttendanceModule = () => {
     // ==========================================================================
     // 1.4.9 EFFECTS
     // ==========================================================================
-    // Keep the latest fetch function in a ref so the fetch effect can call it
-    // without depending on listFetchNow's unstable identity.
     useEffect(() => {
         listFetchNowRef.current = listFetchNow;
-    });
-    // Initial load via cache; re-fetch directly from API on page/pageLimit/filter/search changes.
+    }, [listFetchNow]);
     useEffect(() => {
         var _a;
-        if (!schoolId)
-            return;
-        const currentPage = Number(listParams.currentPage) || 1;
-        const currentPageLimit = Number(listParams.pageLimit) || pageLimit;
-        const isDefaultLoad = currentPage === 1 &&
-            currentPageLimit === pageLimit &&
-            !listParams.searchQuery &&
-            listParams.filterEnabled === undefined;
-        if (isDefaultLoad) {
-            (async () => {
-                try {
-                    const { count, items } = await getCachedAttendances({
-                        params: listParams,
-                    });
-                    dispatch({
-                        type: ATTENDANCE_ACTION_TYPES.SET_ITEMS,
-                        payload: { items: items || [], count: count || 0 },
-                    });
-                }
-                catch (_a) {
-                    showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
-                }
-            })();
-        }
-        else {
-            // Bypass cache for pagination, pageLimit, filter and search changes.
-            // Use ref to avoid the infinite-loop caused by listFetchNow's unstable identity.
-            (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
-        }
-    }, [listParams, dispatch, showToast, schoolId, t]);
+        (_a = listFetchNowRef.current) === null || _a === void 0 ? void 0 : _a.call(listFetchNowRef);
+    }, [listParams]);
     // ==========================================================================
     // 1.4.10 RETURN
     // ==========================================================================

package/base-modules/attendance/form.js

@@ -1,22 +1,38 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { EnhancedCheckbox } from "@appcorp/shadcn/components/enhanced-checkbox";
-import { EnhancedCombobox } from "@appcorp/shadcn/components/enhanced-combobox";
+import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
 import { EnhancedTextarea } from "@appcorp/shadcn/components/enhanced-textarea";
 import { useAttendanceModule } from "./context";
-import { ATTENDANCE_STATUS_OPTIONS } from "./constants";
+import { ATTENDANCE_STATUS_OPTIONS, ATTENDANCE_API_ROUTES } from "./constants";
 import { useTranslations } from "next-intl";
 export const AttendanceForm = () => {
     const { state, handleChange } = useAttendanceModule();
     const { date, enabled, errors, remarks, status } = state;
     const t = useTranslations("attendance");
-    return (_jsxs("div", { className: "space-y-4", children: [_jsx(EnhancedInput, { error: errors.date, id: "date", info: t("formDateInfo"), label: t("formDateLabel"), onChange: (e) => handleChange("date", e.target.value), placeholder: t("formDatePlaceholder"), required: true, type: "date", value: date }), _jsx(EnhancedCombobox, { error: errors.status, id: "status", info: t("formStatusInfo"), label: t("formOptionStatus"), onValueChange: (value) => handleChange("status", value), options: ATTENDANCE_STATUS_OPTIONS.map((opt) => ({
-                    label: t(`status${opt.value.charAt(0).toUpperCase() +
-                        opt.value
-                            .slice(1)
-                            .toLowerCase()
-                            .replace(/_([a-z])/g, (_, c) => c.toUpperCase())}`),
-                    value: opt.value,
-                })), placeholder: t("formStatusPlaceholder"), required: true, searchPlaceholder: t("formSearchStatusPlaceholder"), emptyText: t("formNoStatusEmpty"), value: status }), _jsx(EnhancedTextarea, { error: errors.remarks, id: "remarks", info: t("formRemarksInfo"), label: t("formRemarksLabel"), onChange: (e) => handleChange("remarks", e.target.value), placeholder: t("formRemarksPlaceholder"), rows: 3, value: remarks !== null && remarks !== void 0 ? remarks : "" }), _jsx(EnhancedCheckbox, { defaultChecked: enabled, label: t("formActiveAttendanceRecordLabel"), onCheckedChange: (checked) => handleChange("enabled", checked) })] }));
+    const attendanceStatusLabelMap = {
+        PRESENT: t("formOptionPresent"),
+        ABSENT: t("formOptionAbsent"),
+        LATE: t("formOptionLate"),
+        EXCUSED: t("formOptionExcused"),
+        HALF_DAY: t("formOptionHalfDay"),
+    };
+    const { enhancedComboboxElement: statusCombo } = useEnhancedCombobox({
+        id: "status",
+        info: t("formStatusInfo"),
+        label: t("formOptionStatus"),
+        onValueChange: (value) => handleChange("status", value),
+        options: ATTENDANCE_STATUS_OPTIONS.map((opt) => ({
+            id: opt.value,
+            name: attendanceStatusLabelMap[opt.value] || opt.label,
+        })),
+        placeholder: t("formStatusPlaceholder"),
+        required: true,
+        searchEndpoint: ATTENDANCE_API_ROUTES.UNIT,
+        searchPlaceholder: t("formSearchStatusPlaceholder"),
+        emptyText: t("formNoStatusEmpty"),
+        value: status,
+    });
+    return (_jsxs("div", { className: "space-y-4", children: [_jsx(EnhancedInput, { error: errors.date, id: "date", info: t("formDateInfo"), label: t("formDateLabel"), onChange: (e) => handleChange("date", e.target.value), placeholder: t("formDatePlaceholder"), required: true, type: "date", value: date }), statusCombo, _jsx(EnhancedTextarea, { error: errors.remarks, id: "remarks", info: t("formRemarksInfo"), label: t("formRemarksLabel"), onChange: (e) => handleChange("remarks", e.target.value), placeholder: t("formRemarksPlaceholder"), rows: 3, value: remarks !== null && remarks !== void 0 ? remarks : "" }), _jsx(EnhancedCheckbox, { defaultChecked: enabled, label: t("formActiveAttendanceRecordLabel"), onCheckedChange: (checked) => handleChange("enabled", checked) })] }));
 };

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

@@ -1,38 +1,47 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { EnhancedCombobox } from "@appcorp/shadcn/components/enhanced-combobox";
+import { useEnhancedCombobox } from "@appcorp/shadcn/hooks/use-enhanced-combobox";
 import { EnhancedRadio } from "@appcorp/shadcn/components/enhanced-radio";
 import { EnhancedTextarea } from "@appcorp/shadcn/components/enhanced-textarea";
-import { getCachedCoursesSync } from "../course/cache";
-import { getCachedEnrollmentsSync } from "../enrollment/cache";
-import { getCachedStudentProfilesSync } from "../student-profile/cache";
-import { useMemo, useState } from "react";
+import { useState } from "react";
+import { ATTENDANCE_API_ROUTES } from "./constants";
 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 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({});
+    const { enhancedComboboxElement: courseIdCombo } = useEnhancedCombobox({
+        emptyText: labelNoCourseFound,
+        id: "courseId",
+        info: labelCourseInfo,
+        label: labelCourse,
+        onValueChange: (value) => setCourseId(value),
+        options: [{ id: "", code: "" }].map((c) => ({
+            id: c.id,
+            name: c.code.trim(),
+        })),
+        placeholder: labelCoursePlaceholder,
+        required: true,
+        searchEndpoint: ATTENDANCE_API_ROUTES.UNIT,
+        searchPlaceholder: labelSearchCourses,
+        value: courseId || "",
+    });
     // 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.sectionId === courseObj.sectionId)
-            .map((e) => e.studentProfileId);
-    }, [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,
-                })), placeholder: labelCoursePlaceholder, required: true, searchPlaceholder: labelSearchCourses, value: courseId || "" }), courseId &&
-                studentsInCourse.length > 0 &&
-                studentsInCourse.map((s) => {
-                    var _a, _b, _c, _d;
-                    const student = studentProfiles.find((sp) => sp.id === s);
-                    return (_jsxs("div", { children: [_jsxs("div", { className: "grid grid-cols-2 gap-2", children: [_jsxs("div", { className: "flex flex-col items-center justify-center", children: [_jsxs("p", { children: [(_a = student === null || student === void 0 ? void 0 : student.familyMember) === null || _a === void 0 ? void 0 : _a.firstName, " ", (_b = student === null || student === void 0 ? void 0 : student.familyMember) === null || _b === void 0 ? void 0 : _b.lastName] }), _jsx("img", { src: (_c = student === null || student === void 0 ? void 0 : student.familyMember) === null || _c === void 0 ? void 0 : _c.avatar, alt: (_d = student === null || student === void 0 ? void 0 : student.familyMember) === null || _d === void 0 ? void 0 : _d.firstName, width: 100, height: 100, className: "rounded-full" })] }), _jsx("div", { children: _jsx(EnhancedRadio, { label: labelAttendanceStatus, name: "attendanceStatus", value: attendance[s] || "PRESENT", options: [
+    // const studentsInCourse = useMemo(() => {
+    //   const courseObj = courses.find((c) => c.id === courseId);
+    //   if (!courseObj) return [];
+    //   return enrollment
+    //     .filter((e) => e.sectionId === courseObj.sectionId)
+    //     .map((e) => e.studentProfileId);
+    // }, [enrollment, courseId, courses]);
+    return (_jsxs("div", { className: "space-y-4", children: [courseIdCombo, courseId &&
+                [].length > 0 &&
+                [].map((s) => {
+                    // const student = studentProfiles.find((sp) => sp.id === s);
+                    return (_jsxs("div", { children: [_jsxs("div", { className: "grid grid-cols-2 gap-2", children: [_jsxs("div", { className: "flex flex-col items-center justify-center", children: [_jsx("p", { children: " " }), _jsx("img", { src: "student?.familyMember?.avatar", alt: "student?.familyMember?.firstName", width: 100, height: 100, className: "rounded-full" })] }), _jsx("div", { children: _jsx(EnhancedRadio, { label: labelAttendanceStatus, name: "attendanceStatus", value: attendance[s] || "PRESENT", options: [
                                                 { label: labelStatusPresent, value: "PRESENT" },
                                                 { label: labelStatusAbsent, value: "ABSENT" },
                                                 { label: labelStatusLate, value: "LATE" },