- {/* Header with theme toggle */}
-
+
+ Login
+ Enter your credentials to sign in
+
+
+
+
+
+
+
+ );
}
diff --git a/jportal/src/components/Profile.jsx b/jportal/src/components/Profile.jsx
index 5aaa136..73bdf40 100644
--- a/jportal/src/components/Profile.jsx
+++ b/jportal/src/components/Profile.jsx
@@ -1,289 +1,584 @@
import React, { useState, useEffect } from "react";
import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs";
-import { Image, UserRound, GraduationCap, IdCard, Mail, BookOpen, Users, Calendar } from "lucide-react";
-
+import {
+ Image,
+ UserRound,
+ GraduationCap,
+ IdCard,
+ Mail,
+ BookOpen,
+ Users,
+ Calendar,
+ CheckCircle,
+} from "lucide-react";
export default function Profile({ w, profileData, setProfileData }) {
- const [loading, setLoading] = useState(true);
- const [activeTab, setActiveTab] = useState("personal");
- const [showProfilePhoto, setShowProfilePhoto] = useState(false);
-
- useEffect(() => {
- const fetchProfileData = async () => {
- // Return early if data is already cached
- if (profileData) {
- setLoading(false);
- return;
- }
-
- setLoading(true);
- try {
- const data = await w.get_personal_info();
- setProfileData(data);
- } catch (error) {
- console.error("Failed to fetch profile data:", error);
- } finally {
- setLoading(false);
- }
- };
-
- fetchProfileData();
- }, [w, profileData, setProfileData]);
-
- if (loading) {
- return (
-
-
+ return (
+
+ {/* Header with theme toggle */}
+
-
- Login
- Enter your credentials to sign in
-
-
-
-
-
-
-
- );
+
+
-
- Loading profile...
-
- );
- }
-
- const info = profileData?.generalinformation || {};
- const qualifications = profileData?.qualification || [];
-
- // Prepare profile/avatar image (mobile header)
- const photoData = profileData?.["photo&signature"]?.photo;
- const hasProfilePhoto = Boolean(photoData);
- const profileImg = hasProfilePhoto
- ? `data:image/jpeg;base64,${photoData}`
- : null;
-
- // Helper function to get initials from name
- const getInitials = (name) => {
- if (!name) return "U";
- const nameParts = name.trim().split(/\s+/);
- if (nameParts.length === 1) {
- // Single name - take first 2 letters
- return nameParts[0].substring(0, 2).toUpperCase();
- }
- // Multiple names - take first letter of first and last name
- const firstName = nameParts[0];
- const lastName = nameParts[nameParts.length - 1];
- return (firstName.charAt(0) + lastName.charAt(0)).toUpperCase();
- };
-
- const initials = getInitials(info.studentname);
-
- return (
-
- {/* Profile Header Card */}
-
-
-
- Personal
-
-
- Academic
-
-
- Contact
-
-
- Education
-
-
-
- {/* Personal Information */}
-
-
-
- {/* Academic Information */}
-
-
-
- {/* Contact + Family + Address */}
-
-
-
- {/* Educational Qualifications */}
-
-
-
-
-
- );
+ const [loading, setLoading] = useState(true);
+ const [activeTab, setActiveTab] = useState("personal");
+ const [showProfilePhoto, setShowProfilePhoto] = useState(false);
+
+ // Fees and Fines state
+ const [feesData, setFeesData] = useState({ fines: [], summary: {} });
+ const [feesLoading, setFeesLoading] = useState(true);
+
+ useEffect(() => {
+ const fetchProfileData = async () => {
+ // Return early if data is already cached
+ if (profileData) {
+ setLoading(false);
+ return;
+ }
+
+ setLoading(true);
+ try {
+ const data = await w.get_personal_info();
+ setProfileData(data);
+ } catch (error) {
+ console.error("Failed to fetch profile data:", error);
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ fetchProfileData();
+ }, [w, profileData, setProfileData]);
+
+ // Fetch fees data separately
+ useEffect(() => {
+ const fetchFeesData = async () => {
+ setFeesLoading(true);
+ try {
+ const [finesData, summaryData] = await Promise.all([
+ w.get_fines_msc_charges().catch((err) => {
+ if (err.message?.includes("NO APPROVED REQUEST FOUND")) {
+ return [];
+ }
+ throw err;
+ }),
+ w.get_fee_summary(),
+ ]);
+
+ setFeesData({
+ fines: Array.isArray(finesData) ? finesData : [],
+ summary: summaryData || {},
+ });
+ } catch (error) {
+ console.error("Failed to fetch fees data for profile:", error);
+ } finally {
+ setFeesLoading(false);
+ }
+ };
+
+ fetchFeesData();
+ }, [w]);
+
+ if (loading) {
+ return (
+
- {hasProfilePhoto && (
-
- )}
-
-
-
- {/* Tabs Bar (mobile) */}
-
- {/* Avatar */}
-
-
- {/* Bottom Row: Semester, Section, Batch */}
-
- {showProfilePhoto && hasProfilePhoto ? (
- 
- ) : (
-
-
- {/* Info */}
-
- {initials}
-
- )}
-
-
- - {info.studentname || "N/A"} -
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Personal Information
-
-
-
-
- Academic Information
-
-
-
-
-
- Contact Information
-
-
-
-
-
- Family Information
-
-
-
-
-
- Current Address
-
-
-
-
- Permanent Address
-
-
-
-
- Educational Qualifications
- {qualifications.map((qual, index) => ( -
-
- ))}
-
- Made with Big 🍆 Energy by{" "}
-
- Yash Malik
-
-
-
+ Loading profile...
+
+ );
+ }
+
+ const info = profileData?.generalinformation || {};
+ const qualifications = profileData?.qualification || [];
+
+ // Prepare profile/avatar image (mobile header)
+ const photoData = profileData?.["photo&signature"]?.photo;
+ const hasProfilePhoto = Boolean(photoData);
+ const profileImg = hasProfilePhoto
+ ? `data:image/jpeg;base64,${photoData}`
+ : null;
+
+ // Helper function to get initials from name
+ const getInitials = (name) => {
+ if (!name) return "U";
+ const nameParts = name.trim().split(/\s+/);
+ if (nameParts.length === 1) {
+ // Single name - take first 2 letters
+ return nameParts[0].substring(0, 2).toUpperCase();
+ }
+ // Multiple names - take first letter of first and last name
+ const firstName = nameParts[0];
+ const lastName = nameParts[nameParts.length - 1];
+ return (firstName.charAt(0) + lastName.charAt(0)).toUpperCase();
+ };
+
+ const initials = getInitials(info.studentname);
+
+ // Fees Helpers
+ const formatCurrency = (amount) => {
+ if (amount === null || amount === undefined) return "N/A";
+ const num = parseFloat(amount);
+ if (isNaN(num)) return "N/A";
+ return `₹${num.toLocaleString("en-IN", {
+ minimumFractionDigits: 0,
+ maximumFractionDigits: 2,
+ })}`;
+ };
+
+ const finesArray = feesData.fines || [];
+ const summaryData = feesData.summary || {};
+ const feeHeads = summaryData.feeHeads || [];
+
+ const totalFines = finesArray.reduce((sum, fine) => {
+ return (
+ sum + (parseFloat(fine.charge) || parseFloat(fine.feeamounttobepaid) || 0)
+ );
+ }, 0);
+
+ const totalFeeAmount = feeHeads.reduce(
+ (sum, head) => sum + (parseFloat(head.feeamount) || 0),
+ 0
+ );
+ const totalReceived = feeHeads.reduce(
+ (sum, head) => sum + (parseFloat(head.receiveamount) || 0),
+ 0
+ );
+ const totalDue = feeHeads.reduce(
+ (sum, head) => sum + (parseFloat(head.dueamount) || 0),
+ 0
+ );
+ const totalRefund = feeHeads.reduce(
+ (sum, head) => sum + (parseFloat(head.refundamount) || 0),
+ 0
+ );
+ const advanceAmount = summaryData.advanceamount?.[0]?.amount || 0;
+
+ return (
+
+ {/* Profile Header Card */}
+
+
+
+ Personal
+
+
+ Academic
+
+
+ Contact
+
+
+ Education
+
+
+ Fines
+
+
+ Fees
+
+
+
+ {/* Personal Information */}
+
+
+
+ {/* Academic Information */}
+
+
+
+ {/* Contact + Family + Address */}
+
+
+
+ {/* Educational Qualifications */}
+
+
+
+ {/* Pending Fines */}
+
+ {feesLoading ? (
+
+
+ {/* Fees Summary */}
+
+ {feesLoading ? (
+
+
+
+
+ );
}
// Helper component for consistent info display
function InfoRow({ label, value }) {
- return (
-
+ {hasProfilePhoto && (
+
+ )}
+
+
+
+ {/* Tabs Bar (mobile) */}
+
+ {/* Avatar */}
+
+
+ {/* Bottom Row: Semester, Section, Batch */}
+
+ {showProfilePhoto && hasProfilePhoto ? (
+
+ ) : (
+
+
+ {/* Info */}
+
+ {initials}
+
+ )}
+
+
+ + {info.studentname || "N/A"} +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Personal Information
+
+
+
+
+ Academic Information
+
+
+
+
+
+ Contact Information
+
+
+
+
+
+ Family Information
+
+
+
+
+
+ Current Address
+
+
+
+
+ Permanent Address
+
+
+
+
+ + Educational Qualifications +
+ {qualifications.map((qual, index) => ( +
+
+ ))}
+ Loading fines data...
+ ) : finesArray.length > 0 ? (
+ <>
+
+
+ {finesArray.map((fine, index) => (
+
+ Total Pending
+
+ {formatCurrency(totalFines)}
+
+
+
+
+ ))}
+
+ ) : (
+ + {fine.servicename || "Charge"} +
+
+
+
+
+ )}
+ No Pending Fines
++ You are all caught up! +
+Loading fees data...
+ ) : (
+ <>
+
+
+
+ {feeHeads.length > 0 && (
+
+
+
+ Total Fee
+
+
+ {formatCurrency(totalFeeAmount)}
+
+
+
+
+ Total Received
+
+
+ {formatCurrency(totalReceived)}
+
+
+
+ {(advanceAmount > 0 || totalRefund > 0) && (
+
+ Total Due
+
+
+ {formatCurrency(totalDue)}
+
+
+
+ )}
+
+ {advanceAmount > 0 ? "Advance" : "Refund"}
+
+
+ {formatCurrency(
+ advanceAmount > 0 ? advanceAmount : totalRefund
+ )}
+
+
+
+ )}
+
+ )}
+ + Fee Breakdown +
+
+ {feeHeads.map((head, idx) => (
+
+
+
+ ))}
+
+
+
+
+
+ {head.stynumber
+ ? `Semester ${head.stynumber}`
+ : "N/A"}
+
+
+ {head.academicyear}
+
+
+ {head.stytypedesc || "Regular"}
+
+
+
+
+ Made with Big 🍆 Energy by{" "}
+
+ Yash Malik
+
+
+
- {label}:
- {value || "N/A"}
-
- );
-}
\ No newline at end of file
+ return (
+
+
+ {label}:
+
+
+ {value || "N/A"}
+
+
+ );
+}