Merge branch 'dev' into formatting-fixes

Author: yanxue06

backend/resolvers/participantResolver.ts

@@ -115,6 +115,44 @@ const participantResolver = {
 
       return result;
     },
+    getWeeklyEarnings: async (
+      _parent: undefined,
+      { participant_id }: { participant_id: number }
+    ): Promise<number[]> => {
+      const today = new Date();
+      const sevenDaysAgo = new Date();
+      sevenDaysAgo.setDate(today.getDate() - 6);
+
+      const todayStr = today.toISOString().split("T")[0];
+      const startStr = sevenDaysAgo.toISOString().split("T")[0];
+
+      const results = await prisma.$queryRaw<
+        { transaction_date: string; total: number }[]
+      >`
+        SELECT 
+          transaction_date,
+          SUM(marillac_bucks) AS total
+        FROM transaction
+        WHERE participant_id = ${participant_id}
+          AND transaction_type = 'EARNING'
+          AND transaction_date >= ${startStr}
+          AND transaction_date <= ${todayStr}
+        GROUP BY transaction_date
+        ORDER BY transaction_date ASC
+      `;
+
+      const last7Days: string[] = Array.from({ length: 7 }, (_, i) => {
+        const d = new Date();
+        d.setDate(today.getDate() - (6 - i));
+        return d.toISOString().split("T")[0];
+      });
+
+      const earningsMap = Object.fromEntries(
+        results.map((r) => [r.transaction_date, Number(r.total)])
+      );
+
+      return last7Days.map((day) => earningsMap[day] || 0);
+      },
   },
   Mutation: {
     createParticipant: async (

backend/types/resolvers.ts

@@ -7,6 +7,7 @@ const resolvers = gql`
     getParticipantByRoom(room_number: Int!): Participant
     getParticipantsByRooms(room_numbers: [Int!]!): [Participant]
     getParticipantById(participantId: Int!): Participant
+    getWeeklyEarnings(participant_id: Int!): [Int!]!
     getGoalHistoryByParticipant(
       participant_id: Int!
       start_date: String

frontend/src/gql/queries.ts

@@ -352,6 +352,12 @@ export const GET_ASSIGNED_TASKS = gql`
   }
 `;
 
+export const GET_WEEKLY_EARNINGS = gql`
+  query GetWeeklyEarnings($participant_id: Int!) {
+    getWeeklyEarnings(participant_id: $participant_id)
+  }
+`;
+
 export const GET_REPORT_RECIPIENTS = gql`
   query getReportRecipients {
     getReportRecipients {

frontend/src/participant/pages/progress/Main.tsx

@@ -3,44 +3,63 @@ import { useQuery } from "@apollo/client";
 import { ParticipantContext } from "../../common/ParticipantContext";
 import { EditGoal } from "./components/EditGoal";
 import { SetGoal } from "./components/SetGoal";
-import { GET_PARTICIPANT_BY_ID } from "../../../gql/queries";
+import {
+  GET_PARTICIPANT_BY_ID,
+  GET_WEEKLY_EARNINGS,
+} from "../../../gql/queries";
 import WeeklyEarningsChart from "./components/EarningsWidget";
 import BucksGoalCard from "./elements/BucksGoalCard";
 
 export default function ParticipantsProgressPage() {
   const [editGoal, setEditGoal] = useState(false);
   const [setGoal, setSetGoal] = useState(false);
   const participantContext = useContext(ParticipantContext);
-  const sampleWeeklyEarnings = [10, 15, 8, 20, 12, 18, 35];
 
-  // Fetch participant data to get current goal
-  const { data, loading, refetch } = useQuery(GET_PARTICIPANT_BY_ID, {
+  // Fetch participant data
+  const {
+    data: participantData,
+    loading: loadingParticipant,
+    refetch: refetchParticipant,
+  } = useQuery(GET_PARTICIPANT_BY_ID, {
     variables: { participantId: participantContext?.id },
     skip: !participantContext?.id,
   });
 
-  const participant = data?.getParticipantById;
+  // Fetch earnings data
+  const {
+    data: earningsData,
+    loading: loadingEarnings,
+    refetch: refetchEarnings,
+  } = useQuery(GET_WEEKLY_EARNINGS, {
+    variables: { participant_id: participantContext?.id },
+    skip: !participantContext?.id,
+  });
+
+  const weeklyEarnings = earningsData?.getWeeklyEarnings || [
+    0, 0, 0, 0, 0, 0, 0,
+  ];
+  const participant = participantData?.getParticipantById;
   const currentGoal = participant?.marillac_bucks_goal;
   const currentBalance = participant?.marillac_bucks || 0;
 
+  const loading = loadingParticipant || loadingEarnings;
+
   const handleClose = () => {
     setSetGoal(false);
     setEditGoal(false);
   };
 
   const handleGoalSet = async () => {
-    await refetch(); // Refresh data to show new goal
+    await refetchParticipant();
     handleClose();
   };
 
   const handleGoalUpdated = async () => {
-    await refetch(); // Refresh data to show updated goal
+    await refetchParticipant();
     handleClose();
   };
-
-  // Don't render goal section until data is loaded to avoid flickering
   if (loading) {
-    return null; // or return a loading spinner if preferred
+    return null;
   }
 
   const handleGoalClick = () => {
@@ -70,7 +89,7 @@ export default function ParticipantsProgressPage() {
         />
       )}
       <div style={{ padding: "10px 20px" }}>
-        <WeeklyEarningsChart weeklyEarnings={sampleWeeklyEarnings} />
+        <WeeklyEarningsChart weeklyEarnings={weeklyEarnings} />
       </div>
     </>
   );