From 0dd13ab5b3d401d19af1bb8115c79553979eb998 Mon Sep 17 00:00:00 2001
From: JagathP <jagathp0210@gmail.com>
Date: Sun, 2 Nov 2025 10:27:17 +0530
Subject: [PATCH 1/2] added feedback stats

---
 .../src/Components/Feedback/FeedbackForm.jsx  |  7 +-
 .../src/Components/Feedback/FeedbackStats.jsx | 78 ++++++++++++++++++-
 frontend/src/hooks/useFeedback.js             | 27 +++----
 frontend/src/utils/getCurrentTenureRange.js   | 19 +++++
 4 files changed, 113 insertions(+), 18 deletions(-)
 create mode 100644 frontend/src/utils/getCurrentTenureRange.js

diff --git a/frontend/src/Components/Feedback/FeedbackForm.jsx b/frontend/src/Components/Feedback/FeedbackForm.jsx
index 288bd0df..10a1a370 100644
--- a/frontend/src/Components/Feedback/FeedbackForm.jsx
+++ b/frontend/src/Components/Feedback/FeedbackForm.jsx
@@ -6,7 +6,6 @@ import { useFeedbackForm } from "../../hooks/useFeedback";
 const FeedbackForm = () => {
   const { formData, filteredTargets, updateFormData, submitFeedback } =
     useFeedbackForm();
-
   const feedbackTypes = [
     "Suggestion",
     "Complaint",
@@ -117,8 +116,10 @@ const FeedbackForm = () => {
               <Select
                 options={filteredTargets}
                 value={
-                 filteredTargets.find((option) => option.value === formData.target_id) || null
-                  }
+                  filteredTargets.find(
+                    (option) => option.value === formData.target_id,
+                  ) || null
+                }
                 onChange={handleTargetChange}
                 isClearable
                 placeholder="Select target"
diff --git a/frontend/src/Components/Feedback/FeedbackStats.jsx b/frontend/src/Components/Feedback/FeedbackStats.jsx
index a946cd09..12ec46d7 100644
--- a/frontend/src/Components/Feedback/FeedbackStats.jsx
+++ b/frontend/src/Components/Feedback/FeedbackStats.jsx
@@ -1,7 +1,81 @@
 import React from "react";
-
+import { useState, useContext } from "react";
+import { AdminContext } from "../../context/AdminContext";
+import { useFeedback } from "../../hooks/useFeedback";
+import getCurrentTenureRange from "../../utils/getCurrentTenureRange";
 const FeedbackStats = () => {
-  return <div>FeedbackStats</div>;
+  const {
+    loading,
+    activeTab,
+    setActiveTab,
+    statusFilter,
+    setStatusFilter,
+    filteredFeedbacks,
+    markAsResolved,
+  } = useFeedback();
+  const { startDate, endDate, tenureYearString } = getCurrentTenureRange();
+  const tenureFeedback = filteredFeedbacks.filter((fb) => {
+    const createdAt = new Date(fb.created_at);
+    return createdAt >= startDate && createdAt <= endDate;
+  });
+  const { isUserLoggedIn } = useContext(AdminContext);
+  const isStudent = isUserLoggedIn?.role === "STUDENT";
+
+  return (
+    <div className="p-1 flex justify-center">
+      <div classname=" flex flex-col items-center justify-center">
+        <p className="text-xl font-semibold justify-center">STATS</p>
+        <p className="text-gray-700 mb-2">
+          Total feedbacks:{" "}
+          <span className="font-semibold text-blue-600">
+            {tenureFeedback.length}
+          </span>
+        </p>
+
+        <p className="text-gray-700 mb-2">
+          Pending feedbacks:{" "}
+          <span className="font-semibold text-yellow-600">
+            {tenureFeedback.filter((fb) => !fb.is_resolved).length}
+          </span>
+        </p>
+
+        <p className="text-gray-700 mb-2">
+          Total resolved feedbacks:{" "}
+          <span className="font-semibold text-green-600">
+            {tenureFeedback.filter((fb) => fb.is_resolved).length}
+          </span>
+        </p>
+
+        <p className="text-gray-700">
+          Recent feedbacks:{" "}
+          <span className="font-semibold text-purple-600">
+            {
+              tenureFeedback.filter((fb) => {
+                const now = new Date();
+                const thirtyDaysAgo = new Date();
+                thirtyDaysAgo.setDate(now.getDate() - 30);
+                const createdAt = new Date(fb.created_at);
+                return createdAt >= thirtyDaysAgo && createdAt <= now;
+              }).length
+            }
+          </span>
+        </p>
+        <p className="text-gray-700">
+          Average Rating:{" "}
+          <span className="font-bold">
+            {tenureFeedback.length > 0
+              ? (
+                  tenureFeedback.reduce(
+                    (sum, fb) => sum + (fb.rating || 0),
+                    0,
+                  ) / tenureFeedback.length
+                ).toFixed(1)
+              : 0}
+          </span>
+        </p>
+      </div>
+    </div>
+  );
 };
 
 export default FeedbackStats;
diff --git a/frontend/src/hooks/useFeedback.js b/frontend/src/hooks/useFeedback.js
index 76efb5ea..40a16e09 100644
--- a/frontend/src/hooks/useFeedback.js
+++ b/frontend/src/hooks/useFeedback.js
@@ -12,21 +12,22 @@ export const useFeedback = () => {
   const [statusFilter, setStatusFilter] = useState("All");
   const { isUserLoggedIn } = useContext(AdminContext);
 
+  const fetchFeedback = async () => {
+    try {
+      const res = await api.get(`/api/feedback/view-feedback`);
+      const sorted = res.data.sort(
+        (a, b) => new Date(b.created_at) - new Date(a.created_at),
+      );
+      setFeedbacks(sorted);
+    } catch (error) {
+      console.error("Error fetching feedbacks:", error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
   // Fetch feedbacks
   useEffect(() => {
-    const fetchFeedback = async () => {
-      try {
-        const res = await api.get(`/api/feedback/view-feedback`);
-        const sorted = res.data.sort(
-          (a, b) => new Date(b.created_at) - new Date(a.created_at),
-        );
-        setFeedbacks(sorted);
-      } catch (error) {
-        console.error("Error fetching feedbacks:", error);
-      } finally {
-        setLoading(false);
-      }
-    };
     fetchFeedback();
   }, []);
 
diff --git a/frontend/src/utils/getCurrentTenureRange.js b/frontend/src/utils/getCurrentTenureRange.js
new file mode 100644
index 00000000..e8d673e1
--- /dev/null
+++ b/frontend/src/utils/getCurrentTenureRange.js
@@ -0,0 +1,19 @@
+const getCurrentTenureRange = () => {
+  const now = new Date();
+  const current_year = now.getFullYear();
+  const current_month = now.getMonth(); // months are 0-indexed
+
+  let startDate, endDate, tenureYearString;
+  if (current_month < 3) {
+    startDate = new Date(current_year - 1, 3, 1);
+    endDate = new Date(current_year, 2, 31, 23, 59, 59);
+    tenureYearString = `${current_year - 1}-${current_year}`;
+  } else {
+    startDate = new Date(current_year, 3, 1);
+    endDate = new Date(current_year + 1, 2, 31, 23, 59, 59);
+    tenureYearString = `${current_year}-${current_year + 1}`;
+  }
+  return { startDate, endDate, tenureYearString };
+};
+
+module.exports = getCurrentTenureRange;

From 9e4aea9b16f83ca7a818297c60fa82e09c50ee0e Mon Sep 17 00:00:00 2001
From: JagathP <jagathp0210@gmail.com>
Date: Sun, 2 Nov 2025 16:05:27 +0530
Subject: [PATCH 2/2] made necessary changes

---
 .../src/Components/Feedback/FeedbackStats.jsx | 99 ++++++++++---------
 1 file changed, 50 insertions(+), 49 deletions(-)

diff --git a/frontend/src/Components/Feedback/FeedbackStats.jsx b/frontend/src/Components/Feedback/FeedbackStats.jsx
index 12ec46d7..63fefd35 100644
--- a/frontend/src/Components/Feedback/FeedbackStats.jsx
+++ b/frontend/src/Components/Feedback/FeedbackStats.jsx
@@ -22,58 +22,59 @@ const FeedbackStats = () => {
   const isStudent = isUserLoggedIn?.role === "STUDENT";
 
   return (
-    <div className="p-1 flex justify-center">
-      <div classname=" flex flex-col items-center justify-center">
-        <p className="text-xl font-semibold justify-center">STATS</p>
-        <p className="text-gray-700 mb-2">
-          Total feedbacks:{" "}
-          <span className="font-semibold text-blue-600">
-            {tenureFeedback.length}
-          </span>
-        </p>
+    <div className="p-2 flex flex-col items-center justify-center">
+      <p className="text-xl font-semibold justify-center">Feedback Stats</p>
+      <p className="text-gray-800 mb-2 ">
+        Total feedbacks:{" "}
+        <span className="font-semibold text-blue-600">
+          {tenureFeedback.length}
+        </span>
+      </p>
 
-        <p className="text-gray-700 mb-2">
-          Pending feedbacks:{" "}
-          <span className="font-semibold text-yellow-600">
-            {tenureFeedback.filter((fb) => !fb.is_resolved).length}
-          </span>
-        </p>
+      <p className="text-gray-800 mb-2">
+        Pending feedbacks:{" "}
+        <span className="font-semibold text-yellow-600">
+          {tenureFeedback.filter((fb) => !fb.is_resolved).length}
+        </span>
+      </p>
 
-        <p className="text-gray-700 mb-2">
-          Total resolved feedbacks:{" "}
-          <span className="font-semibold text-green-600">
-            {tenureFeedback.filter((fb) => fb.is_resolved).length}
-          </span>
-        </p>
+      <p className="text-gray-800 mb-2 ">
+        Total resolved feedbacks:{" "}
+        <span className="font-semibold text-green-600">
+          {tenureFeedback.filter((fb) => fb.is_resolved).length}
+        </span>
+      </p>
 
-        <p className="text-gray-700">
-          Recent feedbacks:{" "}
-          <span className="font-semibold text-purple-600">
-            {
-              tenureFeedback.filter((fb) => {
-                const now = new Date();
-                const thirtyDaysAgo = new Date();
-                thirtyDaysAgo.setDate(now.getDate() - 30);
-                const createdAt = new Date(fb.created_at);
-                return createdAt >= thirtyDaysAgo && createdAt <= now;
-              }).length
-            }
-          </span>
-        </p>
-        <p className="text-gray-700">
-          Average Rating:{" "}
-          <span className="font-bold">
-            {tenureFeedback.length > 0
-              ? (
-                  tenureFeedback.reduce(
-                    (sum, fb) => sum + (fb.rating || 0),
-                    0,
-                  ) / tenureFeedback.length
-                ).toFixed(1)
-              : 0}
-          </span>
-        </p>
-      </div>
+      <p className="text-gray-800 mb-2">
+        Recent feedbacks:{" "}
+        <span className="font-semibold text-purple-600">
+          {
+            tenureFeedback.filter((fb) => {
+              const now = new Date();
+              const thirtyDaysAgo = new Date();
+              thirtyDaysAgo.setDate(now.getDate() - 30);
+              // Clamp to tenure start boundary
+              const effectiveStart =
+                thirtyDaysAgo < startDate ? startDate : thirtyDaysAgo;
+              const createdAt = new Date(fb.created_at);
+              return createdAt >= effectiveStart && createdAt <= now;
+            }).length
+          }
+        </span>
+      </p>
+      <p className="text-gray-800 mb-2">
+        Average Rating:{" "}
+        <span className="font-bold">
+          {tenureFeedback.filter((fb) => fb.rating).length > 0
+            ? (
+                tenureFeedback.reduce(
+                  (sum, fb) => (fb.rating ? sum + fb.rating : sum),
+                  0,
+                ) / tenureFeedback.filter((fb) => fb.rating).length
+              ).toFixed(1)
+            : 0}
+        </span>
+      </p>
     </div>
   );
 };