Fix status

Server/src/routes/donorList.js

@@ -638,8 +638,12 @@ router.get('/:listId/stats', protect, async (req, res) => {
  */
 router.get('/stats/summary', protect, async (req, res) => {
   try {
-    // Get all donor lists
-    const donorLists = await prisma.eventDonorList.findMany();
+    // Get all donor lists with their eventDonors
+    const donorLists = await prisma.eventDonorList.findMany({
+      include: {
+        eventDonors: true
+      }
+    });
 
     if (donorLists.length === 0) {
       return res.status(200).json({
@@ -656,18 +660,44 @@ router.get('/stats/summary', protect, async (req, res) => {
       });
     }
 
-    // Calculate aggregated statistics
+    // Calculate aggregated statistics from eventDonors
     const totalLists = donorLists.length;
-    const totalDonors = donorLists.reduce((sum, list) => sum + list.totalDonors, 0);
-    const totalApproved = donorLists.reduce((sum, list) => sum + list.approved, 0);
-    const totalExcluded = donorLists.reduce((sum, list) => sum + list.excluded, 0);
-    const totalPending = donorLists.reduce((sum, list) => sum + list.pending, 0);
-    const totalAutoExcluded = donorLists.reduce((sum, list) => sum + list.autoExcluded, 0);
-    const totalReviewed = totalApproved + totalExcluded;
-
     const completedLists = donorLists.filter(list => list.reviewStatus === 'completed').length;
     const pendingLists = donorLists.filter(list => list.reviewStatus === 'pending').length;
-
+
+    // Initialize counters
+    let totalDonors = 0;
+    let totalApproved = 0;
+    let totalExcluded = 0;
+    let totalPending = 0;
+    let totalAutoExcluded = 0;
+
+    // Calculate statistics from eventDonors
+    donorLists.forEach(list => {
+      const donors = list.eventDonors;
+      totalDonors += donors.length;
+
+      donors.forEach(donor => {
+        switch (donor.status) {
+          case 'Approved':
+            totalApproved++;
+            break;
+          case 'Excluded':
+            totalExcluded++;
+            break;
+          case 'Pending':
+            totalPending++;
+            break;
+          default:
+            break;
+        }
+        if (donor.autoExcluded) {
+          totalAutoExcluded++;
+        }
+      });
+    });
+
+    const totalReviewed = totalApproved + totalExcluded;
     const overallApprovalRate = totalDonors > 0 
       ? Math.round((totalApproved / totalDonors) * 100) 
       : 0;

Server/src/routes/event.js

@@ -114,9 +114,6 @@ router.get('/', protect, async (req, res) => {
 
       if (validStatuses.includes(status)) {
         where.status = status;
-      } else if (status === 'active') {
-        // 特殊情况: 'active' 可以映射到多个"活跃"状态
-        where.status = { in: ['Planning', 'ListGeneration', 'Review', 'Ready'] };
       }
     }
 
@@ -241,7 +238,7 @@ router.post('/', protect, async (req, res) => {
       timelineListGenerationDate,
       timelineReviewDeadline,
       timelineInvitationDate,
-      status = 'Planning'
+      status
     } = req.body;
 
     // Validate required fields

client/src/components/Dashboard.jsx

@@ -31,7 +31,7 @@ const Dashboard = () => {
       const summary = await getDonorListsSummary();
 
       // Fetch active events
-      const eventsResult = await getEvents({ status: 'active', limit: 10 });
+      const eventsResult = await getEvents({ status: 'Ready', limit: 10 });
       const activeEvents = eventsResult.data || [];
 
       // 在设置状态前检查组件是否仍然挂载

client/src/components/donors/Donors.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { FaUser, FaPlus, FaAngleDown, FaSpinner, FaDownload } from 'react-icons/fa';
 import { getEvents, getEventById, getEventDonors } from '../../services/eventService';
 import { getAvailableDonors, removeDonorFromEvent, getEventDonorStats, updateEventDonor, exportEventDonorsToCsv } from '../../services/donorService';
 import { useLocation } from 'react-router-dom';
 import './Donors.css';
 import DonorList from './DonorList';
@@ -57,7 +57,7 @@
   // Fetch events on component mount
   useEffect(() => {
     fetchEvents();
   }, []);
 
   // Handle event selection from location state
   useEffect(() => {
@@ -90,7 +90,7 @@
         fetchEventStats();
       }
     }
   }, [selectedEvent, searchQuery, currentPage]);
 
   // Fetch events
   const fetchEvents = async () => {
@@ -503,7 +503,7 @@
    * @param {Object} donor - The donor to edit status for
    */
   const handleOpenStatusModal = (donor) => {
-    if (selectedEvent.status !== 'active') {
+    if (selectedEvent.status !== 'Ready') {
       alert('Only events in Ready status can edit donor information');
       return;
     }
@@ -584,7 +584,7 @@
   // Check if the selected event is in Ready status
   const isEventReady = () => {
     if (!selectedEvent) return false;
-    return selectedEvent.status === 'active';
+    return selectedEvent.status === 'Ready';
   };
 
   // handle status filter

client/src/components/events/EventManagement.css

@@ -480,7 +480,7 @@
 }
 
 /* Ready - Light Green */
-.activity-status.active {
+.activity-status.ready {
   background-color: #D1FAE5;
   color: #10B981;
 }

client/src/services/eventService.js

@@ -15,31 +15,15 @@ export const getEvents = async (params = {}) => {
   try {
     const url = new URL(`${API_URL}/api/events`);
 
-    // Handle incoming active status, map to correct backend status value
-    const modifiedParams = { ...params };
-
-    // If status is "active", replace it with backend understood value "Ready"
-    if (modifiedParams.status === 'active') {
-      modifiedParams.status = 'Ready';
-    }
-
     // Add query parameters
-    Object.keys(modifiedParams).forEach(key => {
-      if (modifiedParams[key] !== undefined && modifiedParams[key] !== '') {
-        url.searchParams.append(key, modifiedParams[key]);
+    Object.keys(params).forEach(key => {
+      if (params[key] !== undefined && params[key] !== '') {
+        url.searchParams.append(key, params[key]);
       }
     });
 
     const data = await fetchWithAuth(url.toString());
 
-    // Map backend status values back to frontend values
-    if (data.events) {
-      data.events = data.events.map(event => ({
-        ...event,
-        status: event.status === 'Ready' ? 'active' : event.status.toLowerCase()
-      }));
-    }
-
     return {
       data: data.events || [],
       page: data.page || 1,

client/src/utils/statusConversion.js

@@ -7,27 +7,23 @@
  */
 export const toFrontendStatus = (backendStatus) => {
     if (!backendStatus) return '';
-
-    switch(backendStatus) {
-      case 'Ready': return 'active';
-      default: return backendStatus.toLowerCase();
-    }
-  };
+    return backendStatus;
+};
 
-  /**
-   * Converts frontend event status format to backend format
-   * @param {string} frontendStatus - Status string from the frontend
-   * @returns {string} Backend-formatted status matching Prisma EventStatus enum
-   */
-  export const toBackendStatus = (frontendStatus) => {
+/**
+ * Converts frontend event status format to backend format
+ * @param {string} frontendStatus - Status string from the frontend
+ * @returns {string} Backend-formatted status matching Prisma EventStatus enum
+ */
+export const toBackendStatus = (frontendStatus) => {
     if (!frontendStatus) return 'Planning'; // Default value
 
     switch(frontendStatus) {
-      case 'active': return 'Ready';
-      case 'complete': return 'Complete';
-      case 'planning': return 'Planning';
-      case 'listgeneration': return 'ListGeneration';
-      case 'review': return 'Review';
-      default: return frontendStatus; // Fallback if already in correct format
+        case 'Complete': return 'Complete';
+        case 'Planning': return 'Planning';
+        case 'ListGeneration': return 'ListGeneration';
+        case 'Review': return 'Review';
+        case 'Ready': return 'Ready';
+        default: return frontendStatus; // Fallback if already in correct format
     }
-  };
+};