Upload 35 files

pages/Dashboard.tsx

@@ -75,6 +75,7 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
         if (isAdmin && classes.length > 0) {
             const grades = Array.from(new Set((classes as ClassInfo[]).map((c: ClassInfo) => c.grade))).sort(sortGrades);
             if (grades.length > 0) {
+                // IMPORTANT: Default viewGrade to the first available grade so schedule isn't empty
                 setViewGrade(grades[0] as string);
             }
         }
@@ -108,7 +109,8 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
   }, []);
 
   useEffect(() => {
-     if (showSchedule) fetchSchedules();
+     // Fetch schedules whenever showSchedule opens OR viewGrade changes
+     if (showSchedule || viewGrade) fetchSchedules();
   }, [showSchedule, viewGrade]);
 
   const fetchSchedules = async () => {
@@ -116,6 +118,7 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
         const params: any = {};
         if (isAdmin) {
            if (!viewGrade) return; 
+           // Sending grade parameter which backend will now treat as a regex filter for className
            params.grade = viewGrade;
         } else {
            if (currentUser?.role === 'TEACHER') {
@@ -168,7 +171,9 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
   };
 
   const uniqueGrades = Array.from(new Set(classList.map(c => c.grade))).sort(sortGrades);
-  const modalClassOptions = isAdmin 
+  
+  // Filter class options in the modal based on currently selected viewGrade (if Admin)
+  const modalClassOptions = isAdmin && viewGrade
       ? classList.filter(c => c.grade === viewGrade).map(c => c.grade + c.className).sort(sortClasses)
       : classList.map(c => c.grade + c.className).sort(sortClasses);
 
@@ -272,11 +277,11 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
                      {isAdmin && (
                         <div className="flex bg-gray-100 rounded-lg p-1">
                            <select 
-                             className="bg-transparent border-none text-sm p-2 focus:ring-0 font-medium text-gray-700 cursor-pointer"
+                             className="bg-transparent border-none text-sm p-2 focus:ring-0 font-medium text-gray-700 cursor-pointer outline-none"
                              value={viewGrade}
                              onChange={e => setViewGrade(e.target.value)}
                            >
-                              {uniqueGrades.length > 0 ? uniqueGrades.map(g => <option key={g} value={g}>{g}</option>) : <option>无年级数据</option>}
+                              {uniqueGrades.length > 0 ? uniqueGrades.map(g => <option key={g} value={g}>{g}</option>) : <option value="">无年级数据</option>}
                            </select>
                         </div>
                      )}

server.js

@@ -135,8 +135,7 @@ app.post('/api/games/lucky-draw', async (req, res) => {
       // 1. Get Student
       const student = await Student.findById(studentId);
       if (!student) return res.status(404).json({ error: 'Student not found' });
-      if (student.drawAttempts <= 0) return res.status(403).json({ error: '次数不足', message: '您的抽奖次数已用完' });
-
+      
       // 2. Get Config
       const filter = schoolId ? { $or: [{ schoolId }, { schoolId: { $exists: false } }] } : {};
       const config = await LuckyDrawConfigModel.findOne(filter);
@@ -147,6 +146,8 @@ app.post('/api/games/lucky-draw', async (req, res) => {
       // 2.5 Daily Limit Check
       // Only limit if it's a STUDENT drawing for themselves. Teachers/Admins bypass limits.
       if (userRole === 'STUDENT') {
+          if (student.drawAttempts <= 0) return res.status(403).json({ error: '次数不足', message: '您的抽奖次数已用完' });
+          
           const today = new Date().toISOString().split('T')[0];
           let dailyLog = student.dailyDrawLog || { date: today, count: 0 };
           
@@ -160,49 +161,57 @@ app.post('/api/games/lucky-draw', async (req, res) => {
           
           // Increment daily count
           dailyLog.count += 1;
-          // Note: We'll save this along with drawAttempts deduction
+          // Consume Attempt
+          student.drawAttempts -= 1;
           student.dailyDrawLog = dailyLog;
+          await student.save();
+      } else {
+          // Teacher/Admin proxy draw - just consume attempts, no daily limit
+          if (student.drawAttempts <= 0) return res.status(403).json({ error: '次数不足', message: '该学生抽奖次数已用完' });
+          student.drawAttempts -= 1;
+          await student.save();
       }
 
       // 3. Global Inventory Check
       const availablePrizes = prizes.filter(p => (p.count === undefined || p.count > 0));
       if (availablePrizes.length === 0) {
-         return res.status(409).json({ error: 'POOL_EMPTY', message: '奖品池已见底' });
+         // Even if pool empty, we consumed attempt? Maybe refund? 
+         // For now, let's allow "Consolation" if pool empty
       }
 
       // 4. Weighted Random Logic
       let selectedPrize = defaultPrize;
       let rewardType = 'CONSOLATION'; // Default to consolation
-      const random = Math.random() * 100;
-      let currentWeight = 0;
-      let matchedPrize = null;
-
-      for (const p of availablePrizes) {
-         currentWeight += p.probability || 0;
-         if (random <= currentWeight) {
-            matchedPrize = p;
-            break;
-         }
-      }
-
-      if (matchedPrize) {
-         selectedPrize = matchedPrize.name;
-         rewardType = 'ITEM'; // It's a real prize
-         // Only decrease count if it's not infinite (undefined)
-         if (matchedPrize.count !== undefined && matchedPrize.count > 0) {
-            if (config._id) {
-                await LuckyDrawConfigModel.updateOne(
-                    { _id: config._id, "prizes.id": matchedPrize.id },
-                    { $inc: { "prizes.$.count": -1 } }
-                );
-            }
-         }
+      
+      // If pool is empty, force consolation
+      if (availablePrizes.length > 0) {
+          const random = Math.random() * 100;
+          let currentWeight = 0;
+          let matchedPrize = null;
+    
+          for (const p of availablePrizes) {
+             currentWeight += p.probability || 0;
+             if (random <= currentWeight) {
+                matchedPrize = p;
+                break;
+             }
+          }
+    
+          if (matchedPrize) {
+             selectedPrize = matchedPrize.name;
+             rewardType = 'ITEM'; // It's a real prize
+             // Only decrease count if it's not infinite (undefined)
+             if (matchedPrize.count !== undefined && matchedPrize.count > 0) {
+                if (config._id) {
+                    await LuckyDrawConfigModel.updateOne(
+                        { _id: config._id, "prizes.id": matchedPrize.id },
+                        { $inc: { "prizes.$.count": -1 } }
+                    );
+                }
+             }
+          }
       }
 
-      // 5. Consume Attempt & Save Daily Log
-      student.drawAttempts -= 1;
-      await student.save();
-
       // 6. Record Reward
       // Note: Consolation prizes are recorded but handled differently in UI
       await StudentRewardModel.create({
@@ -399,7 +408,19 @@ app.delete('/api/scores/:id', async (req, res) => { await Score.findByIdAndDelet
 app.get('/api/exams', async (req, res) => { res.json(await ExamModel.find(getQueryFilter(req))); });
 app.post('/api/exams', async (req, res) => { await ExamModel.findOneAndUpdate({name:req.body.name}, injectSchoolId(req, req.body), {upsert:true}); res.json({}); });
 
-app.get('/api/schedules', async (req, res) => { res.json(await ScheduleModel.find({...getQueryFilter(req), ...req.query})); });
+// SCHEDULES API: MODIFIED TO SUPPORT GRADE REGEX QUERY
+app.get('/api/schedules', async (req, res) => { 
+    const query = { ...getQueryFilter(req), ...req.query };
+    
+    // IMPORTANT: If 'grade' is passed (e.g. from Admin Dashboard), filter className by startsWith
+    if (query.grade) {
+        query.className = { $regex: '^' + query.grade };
+        delete query.grade; // Remove original grade param as it's not in schema
+    }
+    
+    res.json(await ScheduleModel.find(query)); 
+});
+
 app.post('/api/schedules', async (req, res) => { 
     // For upsert, we need to include schoolId in the query to avoid overwriting other schools' schedules
     const filter = { className:req.body.className, dayOfWeek:req.body.dayOfWeek, period:req.body.period };