@appcorp/fusion-storybook 0.3.74 → 0.3.76

package/base-modules/student-fee/context/shared.d.ts

@@ -4,8 +4,8 @@ export declare const STUDENT_FEE_DRAWER: {
     readonly FORM_DRAWER: string;
     readonly MORE_ACTIONS_DRAWER: string;
     readonly VIEW_DRAWER: string;
-    readonly SINGLE_ENTRY_DRAWER: "SINGLE_ENTRY_DRAWER";
-    readonly CREATE_MONTHLY_DRAWER: "CREATE_MONTHLY_DRAWER";
+    readonly MISC_DRAWER_1: string;
+    readonly MISC_DRAWER_2: string;
 };
 export interface StudentFeesListResponse {
     items: StudentFeeBE[];

package/base-modules/student-fee/context/shared.js

@@ -11,8 +11,8 @@ export const STUDENT_FEE_DRAWER = {
     FORM_DRAWER: DRAWER_TYPES.FORM_DRAWER,
     MORE_ACTIONS_DRAWER: DRAWER_TYPES.MORE_ACTIONS_DRAWER,
     VIEW_DRAWER: DRAWER_TYPES.VIEW_DRAWER,
-    SINGLE_ENTRY_DRAWER: "SINGLE_ENTRY_DRAWER",
-    CREATE_MONTHLY_DRAWER: "CREATE_MONTHLY_DRAWER",
+    MISC_DRAWER_1: DRAWER_TYPES.MISC_DRAWER_1,
+    MISC_DRAWER_2: DRAWER_TYPES.MISC_DRAWER_2,
 };
 const studentFeeConfig = {
     name: "StudentFee",

package/base-modules/student-fee/context/use-student-fee-module.js

@@ -460,7 +460,7 @@ export const useStudentFeeModule = () => {
         resetRecordFormState();
         dispatch({
             type: STUDENT_FEE_ACTION_TYPES.SET_DRAWER,
-            payload: { drawer: STUDENT_FEE_DRAWER.SINGLE_ENTRY_DRAWER },
+            payload: { drawer: STUDENT_FEE_DRAWER.MISC_DRAWER_1 },
         });
     }, [dispatch, resetRecordFormState]);
     const handleCreateMonthly = useCallback(() => {
@@ -471,7 +471,7 @@ export const useStudentFeeModule = () => {
         });
         dispatch({
             type: STUDENT_FEE_ACTION_TYPES.SET_DRAWER,
-            payload: { drawer: STUDENT_FEE_DRAWER.CREATE_MONTHLY_DRAWER },
+            payload: { drawer: STUDENT_FEE_DRAWER.MISC_DRAWER_2 },
         });
     }, [dispatch, resetRecordFormState]);
     const handleView = useCallback((row) => {

package/base-modules/student-fee/monthly-create.js

@@ -10,6 +10,6 @@ export const StudentFeeCreateMonthly = () => {
     const { closeDrawer, handleProceedMonthlyCreation, state, updateLoading } = useStudentFeeModule();
     const t = useTranslations("studentFee");
     const { disableSaveButton, drawer, errors } = state;
-    const isOpen = drawer === STUDENT_FEE_DRAWER.CREATE_MONTHLY_DRAWER;
+    const isOpen = drawer === STUDENT_FEE_DRAWER.MISC_DRAWER_1;
     return (_jsx(DrawerGeneric, { filterDrawer: null, filterDrawerHeader: null, filterDrawerFooter: null, formDrawer: isOpen ? _jsx(StudentFeeMonthlyForm, {}) : null, formDrawerHeader: isOpen ? (_jsx(EnhancedDrawerHeader, { title: t("drawerCreateMonthlyTitle"), description: t("drawerCreateMonthlyDescription") })) : null, formDrawerFooter: isOpen ? (_jsx(EnhancedDrawerFooter, { applyFilters: () => { }, clearFilters: () => { }, closeDrawer: closeDrawer, disableSaveButton: disableSaveButton, drawerType: DRAWER_FOOTER_COMPONENT_TYPE.FORM_DRAWER, errors: errors, handleSubmit: handleProceedMonthlyCreation, updateLoading: updateLoading })) : null, viewDrawer: null, viewDrawerHeader: null, viewDrawerFooter: null, moreActionsDrawer: null, moreActionsDrawerHeader: null, moreActionsDrawerFooter: null, onOpenChange: (open) => !open && closeDrawer(), open: isOpen }));
 };

package/base-modules/student-fee/msic-1.d.ts

@@ -0,0 +1,8 @@
+/**
+ * StudentFee Filter
+ *
+ * Filter UI for the student-fee list. Supports filterEnabled (radio) and
+ * filterStatus (payment status combobox).
+ */
+import React from "react";
+export declare const StudentFeeMonthly: () => React.JSX.Element;

package/base-modules/student-fee/msic-1.js

@@ -0,0 +1,33 @@
+"use client";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * StudentFee Filter
+ *
+ * Filter UI for the student-fee list. Supports filterEnabled (radio) and
+ * filterStatus (payment status combobox).
+ */
+import { useCallback, useState } from "react";
+import { STUDENT_FEE_ACTION_TYPES, useStudentFeeModule } from "./context";
+import { useTranslations } from "next-intl";
+import { EnhancedCheckbox } from "@appcorp/shadcn/components/enhanced-checkbox";
+const CHECKBOX_KEYS = [
+    "formMonthlyCheckStudentProfile",
+    "formMonthlyCheckFeeStructure",
+    "formMonthlyCheckGmail",
+    "formMonthlyCheckReady",
+];
+export const StudentFeeMonthly = () => {
+    const t = useTranslations("studentFee");
+    const { dispatch } = useStudentFeeModule();
+    const [checked, setChecked] = useState(Object.fromEntries(CHECKBOX_KEYS.map((key) => [key, false])));
+    // const allChecked = CHECKBOX_KEYS.every((key) => checked[key]);
+    const handleCheckChange = useCallback((key, value) => {
+        const next = Object.assign(Object.assign({}, checked), { [key]: value });
+        setChecked(next);
+        dispatch({
+            type: STUDENT_FEE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+            payload: { disabled: !CHECKBOX_KEYS.every((k) => next[k]) },
+        });
+    }, [checked, dispatch]);
+    return (_jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx("p", { className: "text-foreground text-sm", children: t("formMonthlyWarningMessage") }), _jsx("div", { className: "flex flex-col gap-3", children: CHECKBOX_KEYS.map((key) => (_jsx(EnhancedCheckbox, { checked: checked[key], id: key, label: t(key), onCheckedChange: (value) => handleCheckChange(key, value) }, key))) })] }));
+};

package/base-modules/student-fee/msic-2.d.ts

@@ -0,0 +1,8 @@
+/**
+ * StudentFee Filter
+ *
+ * Filter UI for the student-fee list. Supports filterEnabled (radio) and
+ * filterStatus (payment status combobox).
+ */
+import React from "react";
+export declare const StudentFeeSingle: () => React.JSX.Element;

package/base-modules/student-fee/msic-2.js

@@ -0,0 +1,122 @@
+"use client";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * StudentFee Filter
+ *
+ * Filter UI for the student-fee list. Supports filterEnabled (radio) and
+ * filterStatus (payment status combobox).
+ */
+import { useEffect, useMemo, useRef, useState } from "react";
+import { STUDENT_FEE_ACTION_TYPES, useStudentFeeModule } from "./context";
+import { useTranslations } from "next-intl";
+import { EnhancedTextarea } from "@appcorp/shadcn/components/enhanced-textarea";
+import { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
+import { getCachedWorkspaceSync } from "../workspace/cache";
+import { useDebounce } from "@react-pakistan/util-functions/hooks/use-debounce";
+import { useFetch } from "@react-pakistan/util-functions/hooks/use-fetch";
+import { STUDENT_FEE_API_ROUTES } from "@/constants";
+import { API_METHODS } from "@react-pakistan/util-functions/constants/api-methods";
+import { DISCOUNT_TYPE } from "../../types";
+import { Loader2 } from "lucide-react";
+export const StudentFeeSingle = () => {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const { dispatch } = useStudentFeeModule();
+    // const { state } = useStudentFeeModule();
+    const workspace = getCachedWorkspaceSync();
+    const currency = (_b = (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.currency) !== null && _b !== void 0 ? _b : "";
+    const t = useTranslations("studentFee");
+    // const [amountPaid, setAmountPaid] = useState("");
+    // const [remarks, setRemarks] = useState("");
+    const [computerNumber, setComputerNumber] = useState("");
+    const [amountPaid, setAmountPaid] = useState("");
+    const [paidAt, setPaidAt] = useState(() => {
+        const d = new Date();
+        return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
+    });
+    const [remarks, setRemarks] = useState("");
+    const debouncedComputerNumber = useDebounce(computerNumber, 800);
+    const { fetchNow: fetchByComputerNumber, data: feeByComputerNumber, loading: fetchingByCN, } = useFetch(STUDENT_FEE_API_ROUTES.BY_COMPUTER_NUMBER, {
+        method: API_METHODS.GET,
+    });
+    const fetchByCNRef = useRef(fetchByComputerNumber);
+    useEffect(() => {
+        fetchByCNRef.current = fetchByComputerNumber;
+    }, [fetchByComputerNumber]);
+    useEffect(() => {
+        var _a;
+        if (!debouncedComputerNumber)
+            return;
+        fetchByCNRef.current(undefined, {
+            params: {
+                computerNumber: debouncedComputerNumber,
+                schoolId: (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id,
+            },
+        });
+    }, [debouncedComputerNumber, (_c = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _c === void 0 ? void 0 : _c.id]);
+    const isStale = computerNumber !== debouncedComputerNumber;
+    const hasData = !!feeByComputerNumber &&
+        !!debouncedComputerNumber &&
+        !isStale &&
+        !fetchingByCN;
+    const response = hasData
+        ? feeByComputerNumber
+        : null;
+    const profile = (_d = response === null || response === void 0 ? void 0 : response.studentProfile) !== null && _d !== void 0 ? _d : null;
+    const fee = (_f = (_e = response === null || response === void 0 ? void 0 : response.studentFees) === null || _e === void 0 ? void 0 : _e[0]) !== null && _f !== void 0 ? _f : null;
+    useEffect(() => {
+        dispatch({
+            type: STUDENT_FEE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+            payload: { disabled: false },
+        });
+    }, [fee, dispatch]);
+    const paymentStatusLabelMap = {
+        PENDING: t("formOptionPending"),
+        PARTIAL: t("formOptionPartial"),
+        PAID: t("formOptionPaid"),
+        OVERDUE: t("formOptionOverdue"),
+        CANCELLED: t("formOptionCancelled"),
+        REFUNDED: t("formOptionRefunded"),
+    };
+    const studentName = profile
+        ? `${profile.firstName} ${profile.lastName}`.trim() || profile.id
+        : "";
+    const feeStructureName = ((_g = fee === null || fee === void 0 ? void 0 : fee.feeStructure) === null || _g === void 0 ? void 0 : _g.name) || (fee === null || fee === void 0 ? void 0 : fee.feeStructureId) || "";
+    const discountCodeLabel = (fee === null || fee === void 0 ? void 0 : fee.discountCode)
+        ? `${fee.discountCode.code} - ${fee.discountCode.discountValue}${fee.discountCode.discountType === DISCOUNT_TYPE.PERCENTAGE ? "%" : currency}`
+        : (fee === null || fee === void 0 ? void 0 : fee.discountCodeId) || "";
+    const statusDisplay = (fee === null || fee === void 0 ? void 0 : fee.status)
+        ? paymentStatusLabelMap[fee.status] || fee.status
+        : "";
+    const formatDisplayDate = (rawDate) => {
+        if (!rawDate)
+            return "";
+        const d = new Date(rawDate);
+        return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
+    };
+    const accumulatedAmount = useMemo(() => {
+        var _a;
+        if (!((_a = response === null || response === void 0 ? void 0 : response.studentFees) === null || _a === void 0 ? void 0 : _a.length))
+            return 0;
+        return response.studentFees.reduce((sum, f) => { var _a; return sum + ((_a = f.amount) !== null && _a !== void 0 ? _a : 0); }, 0);
+    }, [response]);
+    const accumulatedFine = useMemo(() => {
+        var _a;
+        if (!((_a = response === null || response === void 0 ? void 0 : response.studentFees) === null || _a === void 0 ? void 0 : _a.length))
+            return 0;
+        return response.studentFees.reduce((sum, f) => { var _a; return sum + ((_a = f.fine) !== null && _a !== void 0 ? _a : 0); }, 0);
+    }, [response]);
+    const handleUpdateAmountPaid = (value) => {
+        const amountPaid = parseFloat(value);
+        if (isNaN(amountPaid))
+            return;
+        setAmountPaid(value);
+    };
+    useEffect(() => {
+        (async () => {
+            setAmountPaid(String((accumulatedAmount !== null && accumulatedAmount !== void 0 ? accumulatedAmount : 0) + (accumulatedFine !== null && accumulatedFine !== void 0 ? accumulatedFine : 0)));
+        })();
+    }, [fee, accumulatedFine, accumulatedAmount, setAmountPaid]);
+    return (_jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { id: "computerNumber", info: t("formComputerNumberInfo"), label: t("formComputerNumberLabel"), onChange: (e) => setComputerNumber(e.target.value), placeholder: t("formComputerNumberPlaceholder"), type: "number", required: true, value: computerNumber }), fetchingByCN && debouncedComputerNumber ? (_jsx("div", { className: "flex items-center justify-center py-4", children: _jsx(Loader2, { className: "text-muted-foreground h-5 w-5 animate-spin" }) })) : null, fee && profile ? (_jsxs(_Fragment, { children: [_jsx(EnhancedInput, { readOnly: true, id: "studentProfileId-readonly", label: t("formStudentLabel"), value: studentName }), _jsx(EnhancedInput, { readOnly: true, id: "feeStructureId-readonly", label: t("formFeeStructureLabel"), value: feeStructureName }), _jsx(EnhancedInput, { readOnly: true, id: "discountCodeId-readonly", label: t("formDiscountCodeLabel"), value: discountCodeLabel }), _jsx(EnhancedInput, { readOnly: true, id: "discountAmount-readonly", label: t("formDiscountAmountLabel"), value: (_h = fee === null || fee === void 0 ? void 0 : fee.discountAmount) !== null && _h !== void 0 ? _h : 0, type: "number", step: "0.01" }), _jsx(EnhancedInput, { readOnly: true, id: "accumulatedFine-readonly", info: t("formAccumulatedFineInfo"), label: t("formAccumulatedFineLabel"), value: accumulatedFine, type: "number", step: "0.01" }), _jsx(EnhancedInput, { readOnly: true, id: "amount-readonly", info: t("formTotalAmountInfo"), label: t("formTotalAmountLabel"), value: accumulatedAmount + (accumulatedFine !== null && accumulatedFine !== void 0 ? accumulatedFine : 0), type: "number", step: "0.01" }), _jsx(EnhancedInput, { id: "amountPaid", info: t("formAmountPaidInfo"), label: t("formAmountPaidLabel"), value: accumulatedAmount + (accumulatedFine !== null && accumulatedFine !== void 0 ? accumulatedFine : 0) - fee.amountPaid || "0", onChange: (e) => handleUpdateAmountPaid(e.target.value), type: "number", step: "0.01" }), _jsx(EnhancedInput, { readOnly: true, id: "amountDue-readonly", info: t("formAmountDueInfo"), label: t("formAmountDueLabel"), value: (accumulatedAmount !== null && accumulatedAmount !== void 0 ? accumulatedAmount : 0) +
+                            (accumulatedFine !== null && accumulatedFine !== void 0 ? accumulatedFine : 0) -
+                            parseFloat(amountPaid || "0"), type: "number", step: "0.01" }), _jsx(EnhancedInput, { readOnly: true, id: "dueDate-readonly", label: t("formDueDateLabel"), value: formatDisplayDate(fee === null || fee === void 0 ? void 0 : fee.dueDate), type: "date" }), _jsx(EnhancedInput, { id: "paidAt", info: t("formPaidAtInfo"), label: t("formPaidAtLabel"), onChange: (e) => setPaidAt(e.target.value), onClick: (e) => { var _a, _b; return (_b = (_a = e.currentTarget).showPicker) === null || _b === void 0 ? void 0 : _b.call(_a); }, type: "date", value: paidAt || "" }), _jsx(EnhancedInput, { readOnly: true, id: "status-readonly", label: t("formStatusLabel"), value: statusDisplay }), _jsx(EnhancedTextarea, { id: "remarks-readonly", label: t("formRemarksLabel"), value: remarks || "", onChange: (e) => setRemarks(e.target.value) })] })) : null] }));
+};

package/base-modules/student-fee/page.js

@@ -23,11 +23,13 @@ import { StudentFeeFilter } from "./filter";
 import { StudentFeeForm } from "./form";
 import { StudentFeeMoreActions } from "./more-actions";
 import { StudentFeeView } from "./view";
-import { StudentFeeSingleEntry } from "./single-entry";
-import { StudentFeeCreateMonthly } from "./monthly-create";
+// import { StudentFeeSingleEntry } from "./single-entry";
+// import { StudentFeeCreateMonthly } from "./monthly-create";
 import { resolveRbacPermissions } from "../../utils/resolve-rbac-permissions";
 import { RbacNoAccess } from "../../components/rbac-no-access";
 import { formatStudentName, formatAmount, formatAmountPaid, formatAmountDue, } from "./constants";
+import { StudentFeeMonthly } from "./msic-1";
+import { StudentFeeSingle } from "./msic-2";
 // ============================================================================
 // TABLE COLUMN CONFIGURATION (static — formatters imported from constants)
 // ============================================================================
@@ -75,8 +77,8 @@ const createComponentInstances = () => ({
     form: _jsx(StudentFeeForm, {}),
     moreActions: _jsx(StudentFeeMoreActions, {}),
     view: _jsx(StudentFeeView, {}),
-    misc1: _jsx(StudentFeeSingleEntry, {}),
-    misc2: _jsx(StudentFeeCreateMonthly, {}),
+    misc1: _jsx(StudentFeeMonthly, {}),
+    misc2: _jsx(StudentFeeSingle, {}),
 });
 const createStudentFeeConfig = ({ dispatch, drawerButtonCancel, drawerButtonSave, drawerFilterDescription, drawerFilterTitle, drawerFormDescription, drawerFormTitle, drawerMisc1Description, drawerMisc1Title, drawerMisc2Description, drawerMisc2Title, drawerMoreActionsDescription, drawerMoreActionsTitle, drawerViewDescription, drawerViewTitle, tableColumnHeaderActions, tableColumnHeaderAmount, tableColumnHeaderAmountDue, tableColumnHeaderAmountPaid, tableColumnHeaderDueDate, tableColumnHeaderFeeStructure, tableColumnHeaderId, tableColumnHeaderRemarks, tableColumnHeaderStatus, tableColumnHeaderStudent, tableDescription, tableSearchPlaceholder, tableTitle, }) => {
     const components = createComponentInstances();

package/base-modules/student-fee/single-entry.js

@@ -20,7 +20,7 @@ export const StudentFeeSingleEntry = () => {
     const [remarks, setRemarks] = useState("");
     const t = useTranslations("studentFee");
     const { disableSaveButton, drawer, errors } = state;
-    const isOpen = drawer === STUDENT_FEE_DRAWER.SINGLE_ENTRY_DRAWER;
+    const isOpen = drawer === STUDENT_FEE_DRAWER.MISC_DRAWER_2;
     const { fetchNow: fetchByComputerNumber, data: feeByComputerNumber, loading: fetchingByCN, } = useFetch(STUDENT_FEE_API_ROUTES.BY_COMPUTER_NUMBER, {
         method: API_METHODS.GET,
     });

package/package.json

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