Upload 37 files

pages/AchievementTeacher.tsx

@@ -46,8 +46,12 @@ export const AchievementTeacher: React.FC = () => {
                 api.config.getPublic() as Promise<SystemConfig>
             ]);
             
-            // Filter students for homeroom
-            setStudents(stus.filter((s: Student) => s.className === homeroomClass));
+            // Filter students for homeroom & Sort by name
+            const sortedStudents = stus
+                .filter((s: Student) => s.className === homeroomClass)
+                .sort((a: Student, b: Student) => a.name.localeCompare(b.name, 'zh-CN'));
+                
+            setStudents(sortedStudents);
             
             setConfig(cfg || { 
                 schoolId: currentUser?.schoolId || '', 
@@ -335,4 +339,4 @@ export const AchievementTeacher: React.FC = () => {
             </div>
         </div>
     );
-};
+};

pages/ClassList.tsx

@@ -1,15 +1,18 @@
 
 import React, { useState, useEffect } from 'react';
-import { Plus, Trash2, Users, School, Loader2, User as UserIcon } from 'lucide-react';
+import { Plus, Trash2, Users, School, Loader2, User as UserIcon, Edit, Check, X, ShieldAlert } from 'lucide-react';
 import { api } from '../services/api';
 import { ClassInfo, User } from '../types';
 
 export const ClassList: React.FC = () => {
   const [classes, setClasses] = useState<ClassInfo[]>([]);
   const [teachers, setTeachers] = useState<User[]>([]);
+  const [pendingApps, setPendingApps] = useState<User[]>([]);
   const [loading, setLoading] = useState(true);
+  
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [submitting, setSubmitting] = useState(false);
+  const [editClassId, setEditClassId] = useState<string | null>(null);
 
   // Form
   const [grade, setGrade] = useState('一年级');
@@ -28,10 +31,15 @@ export const ClassList: React.FC = () => {
     try {
       const [clsData, userData] = await Promise.all([
           api.classes.getAll(),
-          api.users.getAll({ role: 'TEACHER' })
+          api.users.getAll({ role: 'TEACHER', global: true }) // Get all users to check apps
       ]);
       setClasses(clsData);
       setTeachers(userData);
+      
+      // Filter users with pending class applications
+      const apps = userData.filter((u: User) => u.classApplication && u.classApplication.status === 'PENDING');
+      setPendingApps(apps);
+
     } catch (e) {
       console.error(e);
     } finally {
@@ -50,27 +58,113 @@ export const ClassList: React.FC = () => {
     }
   };
 
+  const openAddModal = () => {
+      setEditClassId(null);
+      setGrade('一年级');
+      setClassName('(1)班');
+      setTeacherName('');
+      setIsModalOpen(true);
+  };
+
+  const openEditModal = (cls: ClassInfo) => {
+      setEditClassId(cls._id || String(cls.id));
+      setGrade(cls.grade);
+      setClassName(cls.className);
+      setTeacherName(cls.teacherName || '');
+      setIsModalOpen(true);
+  };
+
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
     setSubmitting(true);
     try {
-      await api.classes.add({ grade, className, teacherName });
+      const payload = { grade, className, teacherName };
+      if (editClassId) {
+          // Update
+          // Use a direct fetch or update api method to handle PUT
+          // The api.classes.add uses POST, we need a custom call or add method update
+          await fetch(`/api/classes/${editClassId}`, {
+              method: 'PUT',
+              headers: { 
+                  'Content-Type': 'application/json',
+                  'x-school-id': localStorage.getItem('admin_view_school_id') || ''
+              },
+              body: JSON.stringify(payload)
+          });
+      } else {
+          await api.classes.add(payload);
+      }
       setIsModalOpen(false);
-      setTeacherName('');
       loadData();
     } catch (e) {
-      alert('添加失败');
+      alert('操作失败');
     } finally {
       setSubmitting(false);
     }
   };
 
+  const handleApplicationReview = async (user: User, action: 'APPROVE'|'REJECT') => {
+      if (!user.classApplication) return;
+      const typeText = user.classApplication.type === 'CLAIM' ? '任教' : '卸任';
+      if (!confirm(`确认${action === 'APPROVE' ? '同意' : '拒绝'} ${user.trueName || user.username} 的${typeText}申请？`)) return;
+      try {
+          await api.users.applyClass({
+              userId: user._id!,
+              type: user.classApplication.type,
+              targetClass: user.classApplication.targetClass,
+              action
+          });
+          loadData();
+      } catch(e) { alert('操作失败'); }
+  };
+
   return (
     <div className="space-y-6">
+      
+      {/* Pending Approvals Section */}
+      {pendingApps.length > 0 && (
+          <div className="bg-amber-50 border border-amber-200 rounded-xl p-6 animate-in fade-in slide-in-from-top-4">
+              <h3 className="text-lg font-bold text-amber-800 mb-4 flex items-center">
+                  <ShieldAlert className="mr-2"/> 待审核的班主任任免申请
+              </h3>
+              <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+                  {pendingApps.map(appUser => (
+                      <div key={appUser._id} className="bg-white p-4 rounded-lg shadow-sm border border-amber-100 flex flex-col gap-2">
+                          <div className="flex items-center gap-3 mb-2">
+                              <div className="w-10 h-10 rounded-full bg-gray-100 flex items-center justify-center text-lg">
+                                  {appUser.trueName?.[0] || appUser.username[0]}
+                              </div>
+                              <div>
+                                  <div className="font-bold text-gray-800">{appUser.trueName || appUser.username}</div>
+                                  <div className="text-xs text-gray-500">@{appUser.username}</div>
+                              </div>
+                          </div>
+                          <div className="text-sm bg-gray-50 p-2 rounded">
+                              <span className="font-bold text-gray-700">申请类型：</span>
+                              {appUser.classApplication?.type === 'CLAIM' ? (
+                                  <span className="text-blue-600 font-bold">申请成为 {appUser.classApplication.targetClass} 班主任</span>
+                              ) : (
+                                  <span className="text-red-600 font-bold">申请卸任 {appUser.homeroomClass} 班主任</span>
+                              )}
+                          </div>
+                          <div className="flex gap-2 mt-2">
+                              <button onClick={() => handleApplicationReview(appUser, 'APPROVE')} className="flex-1 bg-green-500 hover:bg-green-600 text-white py-1.5 rounded text-sm font-medium flex items-center justify-center">
+                                  <Check size={16} className="mr-1"/> 同意
+                              </button>
+                              <button onClick={() => handleApplicationReview(appUser, 'REJECT')} className="flex-1 bg-red-400 hover:bg-red-500 text-white py-1.5 rounded text-sm font-medium flex items-center justify-center">
+                                  <X size={16} className="mr-1"/> 拒绝
+                              </button>
+                          </div>
+                      </div>
+                  ))}
+              </div>
+          </div>
+      )}
+
       <div className="flex justify-between items-center">
         <h2 className="text-xl font-bold text-gray-800">班级管理</h2>
         <button 
-          onClick={() => setIsModalOpen(true)}
+          onClick={openAddModal}
           className="flex items-center space-x-2 px-4 py-2 bg-blue-600 text-white rounded-lg text-sm font-medium hover:bg-blue-700 shadow-sm"
         >
           <Plus size={16} />
@@ -83,7 +177,7 @@ export const ClassList: React.FC = () => {
       ) : (
         <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
           {classes.map((cls) => (
-            <div key={cls._id || cls.id} className="bg-white rounded-xl shadow-sm border border-gray-100 p-6 flex flex-col justify-between hover:shadow-md transition-shadow">
+            <div key={cls._id || cls.id} className="bg-white rounded-xl shadow-sm border border-gray-100 p-6 flex flex-col justify-between hover:shadow-md transition-shadow group">
                <div className="flex justify-between items-start">
                  <div className="flex items-center space-x-3">
                     <div className="p-3 bg-blue-50 text-blue-600 rounded-lg">
@@ -91,20 +185,32 @@ export const ClassList: React.FC = () => {
                     </div>
                     <div>
                        <h3 className="text-lg font-bold text-gray-800">{cls.grade}{cls.className}</h3>
-                       <p className="text-sm text-gray-500 flex items-center">
-                           <UserIcon size={12} className="mr-1"/>
+                       <p className="text-sm text-gray-500 flex items-center mt-1">
+                           <UserIcon size={14} className="mr-1"/>
                            {cls.teacherName ? (
-                               <span className="text-blue-600 font-bold">{cls.teacherName}</span>
-                           ) : '未任命'}
+                               <span className="text-blue-600 font-bold bg-blue-50 px-1.5 py-0.5 rounded text-xs">{cls.teacherName}</span>
+                           ) : (
+                               <span className="text-gray-400 text-xs">未任命班主任</span>
+                           )}
                        </p>
                     </div>
                  </div>
-                 <button 
-                    onClick={() => handleDelete(cls._id || cls.id!)}
-                    className="text-gray-400 hover:text-red-500 transition-colors"
-                 >
-                    <Trash2 size={18} />
-                 </button>
+                 <div className="flex gap-1 opacity-100 md:opacity-0 group-hover:opacity-100 transition-opacity">
+                     <button 
+                        onClick={() => openEditModal(cls)}
+                        className="p-1.5 text-gray-400 hover:text-blue-500 hover:bg-blue-50 rounded transition-colors"
+                        title="编辑班级信息"
+                     >
+                        <Edit size={18} />
+                     </button>
+                     <button 
+                        onClick={() => handleDelete(cls._id || cls.id!)}
+                        className="p-1.5 text-gray-400 hover:text-red-500 hover:bg-red-50 rounded transition-colors"
+                        title="删除班级"
+                     >
+                        <Trash2 size={18} />
+                     </button>
+                 </div>
                </div>
                
                <div className="mt-6 pt-4 border-t border-gray-50 flex items-center justify-between text-sm">
@@ -120,13 +226,13 @@ export const ClassList: React.FC = () => {
 
       {/* Modal */}
       {isModalOpen && (
-        <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
-          <div className="bg-white rounded-xl shadow-xl max-w-sm w-full p-6">
-            <h3 className="text-lg font-bold text-gray-800 mb-4">新增班级</h3>
+        <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4 backdrop-blur-sm">
+          <div className="bg-white rounded-xl shadow-xl max-w-sm w-full p-6 animate-in zoom-in-95">
+            <h3 className="text-lg font-bold text-gray-800 mb-4">{editClassId ? '编辑班级 / 任命班主任' : '新增班级'}</h3>
             <form onSubmit={handleSubmit} className="space-y-4">
               <div>
                 <label className="text-sm font-medium text-gray-700">年级</label>
-                <select value={grade} onChange={e => setGrade(e.target.value)} className="w-full mt-1 px-3 py-2 border rounded-lg max-h-40">
+                <select value={grade} onChange={e => setGrade(e.target.value)} className="w-full mt-1 px-3 py-2 border rounded-lg max-h-40 bg-white">
                   {grades.map(g => <option key={g} value={g}>{g}</option>)}
                 </select>
               </div>
@@ -136,9 +242,9 @@ export const ClassList: React.FC = () => {
               </div>
               <div>
                 <label className="text-sm font-medium text-gray-700">指定班主任</label>
-                <select value={teacherName} onChange={e => setTeacherName(e.target.value)} className="w-full mt-1 px-3 py-2 border rounded-lg">
+                <select value={teacherName} onChange={e => setTeacherName(e.target.value)} className="w-full mt-1 px-3 py-2 border rounded-lg bg-white">
                     <option value="">-- 暂不指定 --</option>
-                    {teachers.map(t => (
+                    {teachers.sort((a,b)=>(a.trueName||a.username).localeCompare(b.trueName||b.username, 'zh-CN')).map(t => (
                         <option key={t._id} value={t.trueName || t.username}>
                             {t.trueName || t.username} {t.homeroomClass ? `(已任: ${t.homeroomClass})` : ''}
                         </option>
@@ -147,9 +253,9 @@ export const ClassList: React.FC = () => {
                 <p className="text-xs text-gray-500 mt-1">注意：如果该老师已是其他班班主任，将会被重新任命为本班班主任。</p>
               </div>
               <div className="flex space-x-3 pt-4">
-                <button type="button" onClick={() => setIsModalOpen(false)} className="flex-1 py-2 border rounded-lg">取消</button>
-                <button type="submit" disabled={submitting} className="flex-1 py-2 bg-blue-600 text-white rounded-lg">
-                  {submitting ? '提交中...' : '创建'}
+                <button type="button" onClick={() => setIsModalOpen(false)} className="flex-1 py-2 border rounded-lg hover:bg-gray-50">取消</button>
+                <button type="submit" disabled={submitting} className="flex-1 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 shadow-md">
+                  {submitting ? '提交中...' : '保存'}
                 </button>
               </div>
             </form>

pages/GameRewards.tsx

@@ -66,7 +66,8 @@ export const GameRewards: React.FC = () => {
          
          setRewards(res.list || []);
          setTotal(res.total || 0);
-         setStudents(filteredStudents);
+         // Sort students for dropdown by name (pinyin)
+         setStudents(filteredStudents.sort((a: Student, b: Student) => a.name.localeCompare(b.name, 'zh-CN')));
       }
     } catch (e) { console.error(e); } 
     finally { setLoading(false); }

pages/StudentList.tsx

@@ -52,7 +52,8 @@ export const StudentList: React.FC = () => {
         api.students.getAll(),
         api.classes.getAll()
       ]);
-      setStudents(studentData);
+      // Sort students by studentNo by default
+      setStudents(studentData.sort((a: Student, b: Student) => a.studentNo.localeCompare(b.studentNo, undefined, {numeric: true})));
       setClassList(classData);
     } catch (error) {
       console.error(error);
@@ -323,8 +324,8 @@ export const StudentList: React.FC = () => {
                  />
                  )}
               </th>
-              <th className="px-6 py-3">基本信息</th>
               <th className="px-6 py-3">学号</th>
+              <th className="px-6 py-3">姓名/性别</th>
               <th className="px-6 py-3">班级</th>
               <th className="px-6 py-3">家长/住址</th>
               <th className="px-6 py-3 text-right">操作</th>
@@ -338,6 +339,7 @@ export const StudentList: React.FC = () => {
                 <td className="px-6 py-4">
                   {canEdit && <input type="checkbox" checked={selectedIds.has(s._id || String(s.id))} onChange={() => toggleSelect(s._id || String(s.id))} />}
                 </td>
+                <td className="px-6 py-4 text-sm font-mono text-gray-600">{s.studentNo}</td>
                 <td className="px-6 py-4 flex items-center space-x-3">
                    <div className={`w-8 h-8 rounded-full flex items-center justify-center text-xs text-white ${s.gender==='Male'?'bg-blue-400':'bg-pink-400'}`}>{s.name[0]}</div>
                    <div>
@@ -345,7 +347,6 @@ export const StudentList: React.FC = () => {
                       <div className="text-xs text-gray-400">{s.idCard || '身份证未录入'}</div>
                    </div>
                 </td>
-                <td className="px-6 py-4 text-sm font-mono text-gray-600">{s.studentNo}</td>
                 <td className="px-6 py-4 text-sm">
                   <span className="bg-gray-100 px-2 py-1 rounded text-gray-600 text-xs">{s.className}</span>
                 </td>

pages/UserList.tsx

@@ -2,7 +2,7 @@
 import React, { useState, useEffect } from 'react';
 import { User, UserRole, UserStatus, School, ClassInfo } from '../types';
 import { api } from '../services/api';
-import { Loader2, Check, X, Trash2, Building, Edit, Shield, Briefcase, GraduationCap, MinusCircle } from 'lucide-react';
+import { Loader2, Check, X, Trash2, Edit, Briefcase, GraduationCap } from 'lucide-react';
 
 export const UserList: React.FC = () => {
   const [users, setUsers] = useState<User[]>([]);
@@ -89,21 +89,6 @@ export const UserList: React.FC = () => {
       } catch(e) { alert('提交失败'); }
   };
 
-  const handleApplicationReview = async (user: User, action: 'APPROVE'|'REJECT') => {
-      if (!user.classApplication) return;
-      if (!confirm(`确认${action === 'APPROVE' ? '同意' : '拒绝'}该申请？`)) return;
-      try {
-          await api.users.applyClass({
-              userId: user._id!,
-              type: user.classApplication.type,
-              targetClass: user.classApplication.targetClass,
-              action
-          });
-          loadData();
-      } catch(e) { alert('操作失败'); }
-  };
-
-
   const getSchoolName = (id?: string) => schools.find(s => s._id === id)?.name || '未分配';
 
   const filteredUsers = users.filter(user => {
@@ -121,7 +106,7 @@ export const UserList: React.FC = () => {
     <div className="bg-white rounded-xl shadow-sm border border-gray-100 p-6">
       <div className="flex justify-between items-center mb-4">
          <div className="flex items-center gap-4">
-            <h2 className="text-xl font-bold text-gray-800">用户权限与审核</h2>
+            <h2 className="text-xl font-bold text-gray-800">用户权限与账号审核</h2>
             {isTeacher && (
                 <div className="flex items-center gap-2">
                     {currentUser.homeroomClass ? (
@@ -138,7 +123,6 @@ export const UserList: React.FC = () => {
             )}
          </div>
          {isAdmin && <span className="text-xs text-gray-500 bg-gray-100 px-2 py-1 rounded">全局视图</span>}
-         {isTeacher && <span className="text-xs text-blue-500 bg-blue-50 px-2 py-1 rounded border border-blue-100">仅显示 {currentUser.homeroomClass || '我班'} 学生</span>}
       </div>
       
       {filteredUsers.length === 0 ? (
@@ -152,14 +136,13 @@ export const UserList: React.FC = () => {
               <th className="px-4 py-3">详细信息</th>
               <th className="px-4 py-3">所属学校</th>
               <th className="px-4 py-3">角色/班级</th>
-              <th className="px-4 py-3">状态/申请</th>
+              <th className="px-4 py-3">账号状态</th>
               <th className="px-4 py-3 text-right">操作</th>
             </tr>
           </thead>
           <tbody className="divide-y divide-gray-100">
             {filteredUsers.map(user => {
               const isSelf = !!(currentUser && (user._id === currentUser._id || user.username === currentUser.username));
-              const canEdit = isAdmin;
               
               const hasApp = user.classApplication && user.classApplication.status === 'PENDING';
 
@@ -228,36 +211,22 @@ export const UserList: React.FC = () => {
                    )}
                 </td>
                 <td className="px-4 py-3">
-                   {hasApp && isAdmin ? (
-                       <div className="bg-purple-50 border border-purple-200 rounded p-1 text-xs">
-                           <span className="font-bold text-purple-700 block mb-1">
-                               {user.classApplication?.type === 'CLAIM' ? `申请任教: ${user.classApplication.targetClass}` : '申请卸任'}
-                           </span>
-                           <div className="flex gap-1">
-                               <button onClick={()=>handleApplicationReview(user, 'APPROVE')} className="bg-green-500 text-white px-2 rounded hover:bg-green-600">同意</button>
-                               <button onClick={()=>handleApplicationReview(user, 'REJECT')} className="bg-red-400 text-white px-2 rounded hover:bg-red-500">拒绝</button>
-                           </div>
-                       </div>
-                   ) : (
-                       <>
-                        {user.status === 'active' && <span className="bg-green-100 text-green-700 px-2 py-1 rounded-full text-xs">已激活</span>}
-                        {user.status === 'pending' && <span className="bg-yellow-100 text-yellow-700 px-2 py-1 rounded-full text-xs animate-pulse">待审核</span>}
-                        {user.status === 'banned' && <span className="bg-red-100 text-red-700 px-2 py-1 rounded-full text-xs">已停用</span>}
-                        {user.classApplication?.status === 'PENDING' && !isAdmin && <span className="block mt-1 text-[10px] text-gray-400">申请审核中...</span>}
-                       </>
-                   )}
+                   {user.status === 'active' && <span className="bg-green-100 text-green-700 px-2 py-1 rounded-full text-xs">已激活</span>}
+                   {user.status === 'pending' && <span className="bg-yellow-100 text-yellow-700 px-2 py-1 rounded-full text-xs animate-pulse">待审核</span>}
+                   {user.status === 'banned' && <span className="bg-red-100 text-red-700 px-2 py-1 rounded-full text-xs">已停用</span>}
+                   {hasApp && <span className="block mt-1 text-[10px] text-purple-500 font-bold bg-purple-50 px-1 rounded w-fit">申请变动中 (见班级管理)</span>}
                 </td>
                 <td className="px-4 py-3 text-right space-x-2">
                    {user.status === UserStatus.PENDING && (
-                     <button onClick={() => handleApprove(user)} className="text-green-600 hover:bg-green-50 p-1 rounded border border-green-200" title="通过审核">
-                        <span className="flex items-center text-xs font-bold"><Check size={14} className="mr-1"/> 通过</span>
+                     <button onClick={() => handleApprove(user)} className="text-green-600 hover:bg-green-50 p-1 rounded border border-green-200" title="通过注册审核">
+                        <span className="flex items-center text-xs font-bold"><Check size={14} className="mr-1"/> 激活</span>
                      </button>
                    )}
                    {isAdmin && (
                      <button 
                         onClick={() => handleDelete(user)} 
                         className={`p-1 rounded ${user.username === 'admin' || isSelf ? 'text-gray-300 cursor-not-allowed' : 'text-red-600 hover:bg-red-50'}`}
-                        title="删除" 
+                        title="删除账号" 
                         disabled={user.username === 'admin' || isSelf}
                      >
                         <Trash2 size={18} />

server.js

@@ -104,7 +104,7 @@ const ScheduleSchema = new mongoose.Schema({ schoolId: String, className: String
 const ScheduleModel = mongoose.model('Schedule', ScheduleSchema);
 const ConfigSchema = new mongoose.Schema({ key: String, systemName: String, semester: String, semesters: [String], allowRegister: Boolean, allowAdminRegister: Boolean, allowStudentRegister: Boolean, maintenanceMode: Boolean, emailNotify: Boolean });
 const ConfigModel = mongoose.model('Config', ConfigSchema);
-const NotificationSchema = new mongoose.Schema({ schoolId: String, targetRole: String, targetUserId: String, title: String, content: String, type: String, createTime: Date });
+const NotificationSchema = new mongoose.Schema({ schoolId: String, targetRole: String, targetUserId: String, title: String, content: String, type: String, createTime: { type: Date, default: Date.now } });
 const NotificationModel = mongoose.model('Notification', NotificationSchema);
 const GameSessionSchema = new mongoose.Schema({ schoolId: String, className: String, isEnabled: Boolean, maxSteps: Number, teams: [{ id: String, name: String, score: Number, avatar: String, color: String, members: [String] }], rewardsConfig: [{ scoreThreshold: Number, rewardType: String, rewardName: String, rewardValue: Number, achievementId: String }] });
 const GameSessionModel = mongoose.model('GameSession', GameSessionSchema);
@@ -140,12 +140,7 @@ const getAutoSemester = () => {
     const now = new Date();
     const month = now.getMonth() + 1; // 1-12
     const year = now.getFullYear();
-    
-    // Logic: 
-    // Aug(8) to Jan(1) -> First Semester
-    // Feb(2) to Jul(7) -> Second Semester
     if (month >= 8 || month === 1) {
-        // If Jan, it's still the academic year starting previous year
         const startYear = month === 1 ? year - 1 : year;
         return `${startYear}-${startYear + 1}学年 第一学期`;
     } else {
@@ -164,6 +159,9 @@ app.post('/api/users/class-application', async (req, res) => {
 
     if (action === 'APPLY') {
         try {
+            const user = await User.findById(userId);
+            if(!user) return res.status(404).json({error:'User not found'});
+
             await User.findByIdAndUpdate(userId, {
                 classApplication: { 
                     type: type, 
@@ -171,6 +169,26 @@ app.post('/api/users/class-application', async (req, res) => {
                     status: 'PENDING' 
                 }
             });
+
+            // Notify Teacher (Self)
+            const typeText = type === 'CLAIM' ? '申请班主任' : '申请卸任';
+            await NotificationModel.create({
+                schoolId,
+                targetUserId: userId,
+                title: '申请已提交',
+                content: `您已成功提交 ${typeText} (${type === 'CLAIM' ? targetClass : user.homeroomClass}) 的申请，等待管理员审核。`,
+                type: 'info'
+            });
+
+            // Notify Admins
+            await NotificationModel.create({
+                schoolId,
+                targetRole: 'ADMIN',
+                title: '新的班主任任免申请',
+                content: `${user.trueName || user.username} 申请 ${typeText}，请及时处理。`,
+                type: 'warning'
+            });
+
             return res.json({ success: true });
         } catch (e) {
             console.error(e);
@@ -182,38 +200,29 @@ app.post('/api/users/class-application', async (req, res) => {
         const user = await User.findById(userId);
         if (!user || !user.classApplication) return res.status(404).json({ error: 'Application not found' });
 
+        const appType = user.classApplication.type;
+        const appTarget = user.classApplication.targetClass;
+
         if (action === 'APPROVE') {
             const updates = { classApplication: null };
             
-            // Logic: 
-            // 1. If Claiming: Set user homeroomClass = target. 
-            //    Ideally, also remove any other teacher from this class or check conflict? 
-            //    For now, we simply overwrite.
-            // 2. If Resigning: Set user homeroomClass = ''.
-            
-            if (user.classApplication.type === 'CLAIM') {
-                const target = user.classApplication.targetClass;
-                // Update user
-                updates.homeroomClass = target;
-                
-                // Also update Class Record to show this teacher
-                const gradePart = target.match(/^(.+?年级)/)?.[1] || ''; // simple regex guess
-                const classPart = target.replace(gradePart, '');
-                
-                // Try to find the class to update teacherName field for display
-                // Note: Class structure separates grade and className. 
-                // We need to match string concat.
-                // This is a bit tricky without ID, but let's try our best match
-                // Actually, strict matching is better if we have IDs, but here we use names.
-                // Let's iterate or find one.
+            if (appType === 'CLAIM') {
+                updates.homeroomClass = appTarget;
+                // Update Class Record
                 const classes = await ClassModel.find({ schoolId });
-                const matchedClass = classes.find(c => (c.grade + c.className) === target);
+                const matchedClass = classes.find(c => (c.grade + c.className) === appTarget);
                 
                 if (matchedClass) {
+                    // Remove old teacher if any
+                    if (matchedClass.teacherName) {
+                        await User.updateOne(
+                            { trueName: matchedClass.teacherName, schoolId },
+                            { homeroomClass: '' }
+                        );
+                    }
                     await ClassModel.findByIdAndUpdate(matchedClass._id, { teacherName: user.trueName || user.username });
                 }
-                
-            } else if (user.classApplication.type === 'RESIGN') {
+            } else if (appType === 'RESIGN') {
                 updates.homeroomClass = '';
                 // Clear teacher from Class Record
                 if (user.homeroomClass) {
@@ -225,95 +234,72 @@ app.post('/api/users/class-application', async (req, res) => {
                 }
             }
             await User.findByIdAndUpdate(userId, updates);
+
+            // Notify Teacher
+            await NotificationModel.create({
+                schoolId,
+                targetUserId: userId,
+                title: '申请已通过',
+                content: `管理员已同意您的${appType === 'CLAIM' ? '任教' : '卸任'}申请。`,
+                type: 'success'
+            });
+
         } else {
+            // REJECT
             await User.findByIdAndUpdate(userId, { 'classApplication.status': 'REJECTED' });
+
+            // Notify Teacher
+            await NotificationModel.create({
+                schoolId,
+                targetUserId: userId,
+                title: '申请被拒绝',
+                content: `管理员拒绝了您的${appType === 'CLAIM' ? '任教' : '卸任'}申请。`,
+                type: 'error'
+            });
         }
         return res.json({ success: true });
     }
     res.status(403).json({ error: 'Permission denied' });
 });
 
-// --- STUDENT PROMOTION & TRANSFER ROUTES ---
-const GRADE_MAP = {
-  '一年级': '二年级',
-  '二年级': '三年级',
-  '三年级': '四年级',
-  '四年级': '五年级',
-  '五年级': '六年级',
-  '六年级': '毕业',
-  '初一': '初二',
-  '七年级': '八年级',
-  '初二': '初三',
-  '八年级': '九年级',
-  '初三': '毕业',
-  '九年级': '毕业',
-  '高一': '高二',
-  '高二': '高三',
-  '高三': '毕业'
-};
-
-const getNextGrade = (grade) => {
-    return GRADE_MAP[grade] || grade;
-};
-
 app.post('/api/students/promote', async (req, res) => {
+    // ... existing promotion logic ...
     const { teacherFollows } = req.body; 
     const sId = req.headers['x-school-id'];
     const role = req.headers['x-user-role'];
 
     if (role !== 'ADMIN') return res.status(403).json({ error: 'Permission denied' });
 
+    const GRADE_MAP = {
+      '一年级': '二年级', '二年级': '三年级', '三年级': '四年级', '四年级': '五年级', '五年级': '六年级', '六年级': '毕业',
+      '初一': '初二', '七年级': '八年级', '初二': '初三', '八年级': '九年级', '初三': '毕业', '九年级': '毕业',
+      '高一': '高二', '高二': '高三', '高三': '毕业'
+    };
+
     const classes = await ClassModel.find(getQueryFilter(req));
     let promotedCount = 0;
 
     for (const cls of classes) {
         const currentGrade = cls.grade;
-        const nextGrade = getNextGrade(currentGrade);
-        const suffix = cls.className; // e.g. "(1)班"
+        const nextGrade = GRADE_MAP[currentGrade] || currentGrade;
+        const suffix = cls.className; 
 
         if (nextGrade === '毕业') {
              const oldFullClass = cls.grade + cls.className;
-             await Student.updateMany(
-                 { className: oldFullClass, ...getQueryFilter(req) },
-                 { status: 'Graduated', className: '已毕业' }
-             );
+             await Student.updateMany({ className: oldFullClass, ...getQueryFilter(req) }, { status: 'Graduated', className: '已毕业' });
              if (teacherFollows && cls.teacherName) {
                  await User.updateOne({ trueName: cls.teacherName, schoolId: sId }, { homeroomClass: '' });
-                 // Clear class teacher info
                  await ClassModel.findByIdAndUpdate(cls._id, { teacherName: '' });
              }
         } else {
              const oldFullClass = cls.grade + cls.className;
              const newFullClass = nextGrade + suffix; 
-
-             // Check if next class exists, if not create
-             await ClassModel.findOneAndUpdate(
-                 { grade: nextGrade, className: suffix, schoolId: sId },
-                 { 
-                     schoolId: sId,
-                     grade: nextGrade,
-                     className: suffix,
-                     teacherName: teacherFollows ? cls.teacherName : undefined 
-                 },
-                 { upsert: true }
-             );
-
-             const result = await Student.updateMany(
-                 { className: oldFullClass, status: 'Enrolled', ...getQueryFilter(req) },
-                 { className: newFullClass }
-             );
+             await ClassModel.findOneAndUpdate({ grade: nextGrade, className: suffix, schoolId: sId }, { schoolId: sId, grade: nextGrade, className: suffix, teacherName: teacherFollows ? cls.teacherName : undefined }, { upsert: true });
+             const result = await Student.updateMany({ className: oldFullClass, status: 'Enrolled', ...getQueryFilter(req) }, { className: newFullClass });
              promotedCount += result.modifiedCount;
-
              if (teacherFollows && cls.teacherName) {
-                 // Teacher moves to new class
-                 await User.updateOne(
-                     { trueName: cls.teacherName, schoolId: sId, homeroomClass: oldFullClass },
-                     { homeroomClass: newFullClass }
-                 );
-                 // Clear old class teacher if teacher moved
+                 await User.updateOne({ trueName: cls.teacherName, schoolId: sId, homeroomClass: oldFullClass }, { homeroomClass: newFullClass });
                  await ClassModel.findByIdAndUpdate(cls._id, { teacherName: '' });
-             } else {
-                 // Teacher stays. Old class has no students now. 
              }
         }
     }
@@ -324,7 +310,6 @@ app.post('/api/students/transfer', async (req, res) => {
     const { studentId, targetClass } = req.body;
     const student = await Student.findById(studentId);
     if (!student) return res.status(404).json({ error: 'Student not found' });
-    
     student.className = targetClass;
     await student.save();
     res.json({ success: true });
@@ -337,17 +322,12 @@ app.get('/api/achievements/config', async (req, res) => {
     const config = await AchievementConfigModel.findOne({ ...getQueryFilter(req), className });
     res.json(config || { className, achievements: [], exchangeRules: [] });
 });
-
 app.post('/api/achievements/config', async (req, res) => {
     const { className } = req.body;
-    if (!className) return res.status(400).json({ error: 'Class name required' });
     const sId = req.headers['x-school-id'];
-    const filter = { className };
-    if (sId) filter.schoolId = sId;
-    await AchievementConfigModel.findOneAndUpdate(filter, injectSchoolId(req, req.body), { upsert: true });
+    await AchievementConfigModel.findOneAndUpdate({ className, schoolId: sId }, injectSchoolId(req, req.body), { upsert: true });
     res.json({ success: true });
 });
-
 app.get('/api/achievements/student', async (req, res) => {
     const { studentId, semester } = req.query;
     const filter = getQueryFilter(req);
@@ -356,63 +336,34 @@ app.get('/api/achievements/student', async (req, res) => {
     const list = await StudentAchievementModel.find(filter).sort({ createTime: -1 });
     res.json(list);
 });
-
 app.post('/api/achievements/grant', async (req, res) => {
     const { studentId, achievementId, semester } = req.body;
     const sId = req.headers['x-school-id'];
     const student = await Student.findById(studentId);
-    if (!student) return res.status(404).json({ error: 'Student not found' });
-    
     const config = await AchievementConfigModel.findOne({ className: student.className, ...getQueryFilter(req) });
     const ach = config?.achievements.find(a => a.id === achievementId);
-    if (!ach) return res.status(404).json({ error: 'Achievement definition not found' });
+    if (!ach) return res.status(404).json({ error: 'Achievement not found' });
     
-    await StudentAchievementModel.create({
-        schoolId: sId,
-        studentId,
-        studentName: student.name,
-        achievementId: ach.id,
-        achievementName: ach.name,
-        achievementIcon: ach.icon,
-        semester: semester || '当前学期',
-    });
+    await StudentAchievementModel.create({ schoolId: sId, studentId, studentName: student.name, achievementId: ach.id, achievementName: ach.name, achievementIcon: ach.icon, semester: semester || '当前学期' });
     await Student.findByIdAndUpdate(studentId, { $inc: { flowerBalance: ach.points } });
     res.json({ success: true });
 });
-
 app.post('/api/achievements/exchange', async (req, res) => {
     const { studentId, ruleId } = req.body;
     const sId = req.headers['x-school-id'];
-    
     const student = await Student.findById(studentId);
-    if (!student) return res.status(404).json({ error: 'Student not found' });
-    
     const config = await AchievementConfigModel.findOne({ className: student.className, ...getQueryFilter(req) });
     const rule = config?.exchangeRules.find(r => r.id === ruleId);
     if (!rule) return res.status(404).json({ error: 'Exchange rule not found' });
-    
-    if ((student.flowerBalance || 0) < rule.cost) {
-        return res.status(400).json({ error: 'INSUFFICIENT_FLOWERS', message: '小红花余额不足' });
-    }
+    if ((student.flowerBalance || 0) < rule.cost) return res.status(400).json({ error: 'INSUFFICIENT_FLOWERS', message: '小红花余额不足' });
     
     await Student.findByIdAndUpdate(studentId, { $inc: { flowerBalance: -rule.cost } });
-    
     let status = 'PENDING';
     if (rule.rewardType === 'DRAW_COUNT') {
         status = 'REDEEMED';
         await Student.findByIdAndUpdate(studentId, { $inc: { drawAttempts: rule.rewardValue } });
     }
-    
-    await StudentRewardModel.create({ 
-        schoolId: sId, 
-        studentId, 
-        studentName: student.name, 
-        rewardType: rule.rewardType, 
-        name: rule.rewardName,
-        count: rule.rewardValue,
-        status: status, 
-        source: `积分兑换` 
-    });
+    await StudentRewardModel.create({ schoolId: sId, studentId, studentName: student.name, rewardType: rule.rewardType, name: rule.rewardName, count: rule.rewardValue, status: status, source: `积分兑换` });
     res.json({ success: true });
 });
 
@@ -423,18 +374,11 @@ app.get('/api/games/lucky-config', async (req, res) => {
    const config = await LuckyDrawConfigModel.findOne(filter);
    res.json(config || { prizes: [], dailyLimit: 3, cardCount: 9, defaultPrize: '再接再厉' });
 });
-
 app.post('/api/games/lucky-config', async (req, res) => {
    const data = injectSchoolId(req, req.body);
-   if (!data.className) return res.status(400).json({ error: 'Class name required' });
-   await LuckyDrawConfigModel.findOneAndUpdate(
-       { className: data.className, ...getQueryFilter(req) }, 
-       data, 
-       { upsert: true }
-   );
+   await LuckyDrawConfigModel.findOneAndUpdate({ className: data.className, ...getQueryFilter(req) }, data, { upsert: true });
    res.json({ success: true });
 });
-
 app.post('/api/games/lucky-draw', async (req, res) => {
    const { studentId } = req.body; 
    const schoolId = req.headers['x-school-id'];
@@ -443,37 +387,25 @@ app.post('/api/games/lucky-draw', async (req, res) => {
    try {
       const student = await Student.findById(studentId);
       if (!student) return res.status(404).json({ error: 'Student not found' });
-      
-      const filter = { className: student.className };
-      if (schoolId) Object.assign(filter, { $or: [{ schoolId }, { schoolId: { $exists: false } }] });
-      
-      const config = await LuckyDrawConfigModel.findOne(filter);
+      const config = await LuckyDrawConfigModel.findOne({ className: student.className, ...getQueryFilter(req) });
       const prizes = config?.prizes || [];
       const defaultPrize = config?.defaultPrize || '再接再厉';
       const dailyLimit = config?.dailyLimit || 3;
       const consolationWeight = config?.consolationWeight || 0;
 
-      // WEIGHTED RANDOM LOGIC
-      // 1. Filter prizes with inventory
       const availablePrizes = prizes.filter(p => (p.count === undefined || p.count > 0));
-      
-      // 2. Check if pool is empty (no prizes AND no consolation weight)
       if (availablePrizes.length === 0 && consolationWeight === 0) {
           const isTeacherOrAdmin = userRole === 'TEACHER' || userRole === 'ADMIN';
-          const msg = isTeacherOrAdmin 
-              ? '奖品库存不足，不能抽奖，请先补充库存' 
-              : '奖品库存不足，不能抽奖，请联系班主任补充库存';
+          const msg = isTeacherOrAdmin ? '奖品库存不足，不能抽奖，请先补充库存' : '奖品库存不足，不能抽奖，请联系班主任补充库存';
           return res.status(400).json({ error: 'POOL_EMPTY', message: msg });
       }
 
-      // 3. Limit Check
       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 };
           if (dailyLog.date !== today) dailyLog = { date: today, count: 0 };
           if (dailyLog.count >= dailyLimit) return res.status(403).json({ error: 'DAILY_LIMIT_REACHED', message: `今日抽奖次数已达上限 (${dailyLimit}次)` });
-          
           dailyLog.count += 1;
           student.drawAttempts -= 1;
           student.dailyDrawLog = dailyLog;
@@ -484,10 +416,8 @@ app.post('/api/games/lucky-draw', async (req, res) => {
           await student.save();
       }
 
-      // 4. Calculate Total Weight
       let totalWeight = consolationWeight;
       availablePrizes.forEach(p => totalWeight += (p.probability || 0));
-
       let random = Math.random() * totalWeight;
       let selectedPrize = defaultPrize;
       let rewardType = 'CONSOLATION'; 
@@ -504,70 +434,37 @@ app.post('/api/games/lucky-draw', async (req, res) => {
       if (matchedPrize) {
          selectedPrize = matchedPrize.name;
          rewardType = 'ITEM'; 
-         if (config._id) {
-             await LuckyDrawConfigModel.updateOne(
-                 { _id: config._id, "prizes.id": matchedPrize.id },
-                 { $inc: { "prizes.$.count": -1 } }
-             );
-         }
+         if (config._id) await LuckyDrawConfigModel.updateOne({ _id: config._id, "prizes.id": matchedPrize.id }, { $inc: { "prizes.$.count": -1 } });
       }
-
-      await StudentRewardModel.create({
-         schoolId,
-         studentId,
-         studentName: student.name,
-         rewardType,
-         name: selectedPrize,
-         count: 1,
-         status: 'PENDING',
-         source: '幸运大抽奖'
-      });
+      await StudentRewardModel.create({ schoolId, studentId, studentName: student.name, rewardType, name: selectedPrize, count: 1, status: 'PENDING', source: '幸运大抽奖' });
       res.json({ prize: selectedPrize, rewardType });
-
-   } catch (e) {
-      res.status(500).json({ error: e.message });
-   }
+   } catch (e) { res.status(500).json({ error: e.message }); }
 });
 
 // --- Standard Routes ---
 app.get('/api/notifications', async (req, res) => {
   const { role, userId } = req.query; 
-  const query = { 
-      $and: [
-          getQueryFilter(req),
-          { $or: [ { targetRole: null, targetUserId: null }, { targetRole: role }, { targetUserId: userId } ] }
-      ]
-  };
+  const query = { $and: [ getQueryFilter(req), { $or: [ { targetRole: null, targetUserId: null }, { targetRole: role }, { targetUserId: userId } ] } ] };
   res.json(await NotificationModel.find(query).sort({ createTime: -1 }).limit(20));
 });
-
 app.get('/api/public/schools', async (req, res) => { res.json(await School.find({}, 'name code _id')); });
-
-// Updated Config to Auto Generate Semester
 app.get('/api/public/config', async (req, res) => { 
     const currentSem = getAutoSemester();
-    const config = await ConfigModel.findOne({ key: 'main' });
+    let config = await ConfigModel.findOne({ key: 'main' });
     if (config) {
-        // Auto update database if semester is missing or outdated (optional logic, 
-        // but user requested "Auto" so we prioritize current date calculation if not pinned?
-        // Let's assume we always return the calculated one as 'current', but keep DB list for history)
-        
-        // Ensure current sem is in list
         let semesters = config.semesters || [];
         if (!semesters.includes(currentSem)) {
-            semesters.unshift(currentSem); // Add to top
-            await ConfigModel.updateOne({ key: 'main' }, { semesters, semester: currentSem });
+            semesters.unshift(currentSem);
             config.semesters = semesters;
             config.semester = currentSem;
+            await ConfigModel.updateOne({ key: 'main' }, { semesters, semester: currentSem });
         }
-        res.json(config);
     } else {
-        res.json({ allowRegister: true, semester: currentSem, semesters: [currentSem] });
+        config = { key: 'main', allowRegister: true, semester: currentSem, semesters: [currentSem] };
     }
+    res.json(config); 
 });
-
 app.get('/api/public/meta', async (req, res) => { res.json({ classes: await ClassModel.find({ schoolId: req.query.schoolId }), subjects: await SubjectModel.find({ schoolId: req.query.schoolId }) }); });
-
 app.post('/api/auth/login', async (req, res) => {
   const { username, password } = req.body;
   const user = await User.findOne({ username, password });
@@ -575,80 +472,97 @@ app.post('/api/auth/login', async (req, res) => {
   if (user.status !== 'active') return res.status(403).json({ error: 'PENDING_APPROVAL' });
   res.json(user);
 });
-app.post('/api/auth/register', async (req, res) => {
-  try { await User.create({...req.body, status: 'pending'}); res.json({}); } catch(e) { res.status(500).json({}); }
-});
-
+app.post('/api/auth/register', async (req, res) => { try { await User.create({...req.body, status: 'pending'}); res.json({}); } catch(e) { res.status(500).json({}); } });
 app.get('/api/schools', async (req, res) => { res.json(await School.find()); });
 app.post('/api/schools', async (req, res) => { res.json(await School.create(req.body)); });
 app.put('/api/schools/:id', async (req, res) => { await School.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
-
 app.get('/api/users', async (req, res) => { res.json(await User.find(getQueryFilter(req))); });
 app.put('/api/users/:id', async (req, res) => { await User.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/users/:id', async (req, res) => { await User.findByIdAndDelete(req.params.id); res.json({}); });
-
 app.get('/api/students', async (req, res) => { res.json(await Student.find(getQueryFilter(req))); });
 app.post('/api/students', async (req, res) => { await Student.findOneAndUpdate({ studentNo: req.body.studentNo }, injectSchoolId(req, req.body), {upsert:true}); res.json({}); });
 app.put('/api/students/:id', async (req, res) => { await Student.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/students/:id', async (req, res) => { await Student.findByIdAndDelete(req.params.id); res.json({}); });
-
 app.get('/api/classes', async (req, res) => { 
     const cls = await ClassModel.find(getQueryFilter(req)); 
     const resData = await Promise.all(cls.map(async c => ({...c.toObject(), studentCount: await Student.countDocuments({className:c.grade+c.className})})));
     res.json(resData); 
 });
 app.post('/api/classes', async (req, res) => { 
-    // Creating a class -> Sync teacher's homeroom
     const data = injectSchoolId(req, req.body);
     await ClassModel.create(data);
     if (data.teacherName) {
         const fullClass = data.grade + data.className;
-        // Update user record
+        await User.updateOne({ trueName: data.teacherName, schoolId: data.schoolId }, { homeroomClass: fullClass });
+    }
+    res.json({}); 
+});
+// UPDATE CLASS (Edit Teacher)
+app.put('/api/classes/:id', async (req, res) => {
+    const classId = req.params.id;
+    const { grade, className, teacherName } = req.body;
+    const sId = req.headers['x-school-id'];
+
+    const oldClass = await ClassModel.findById(classId);
+    if (!oldClass) return res.status(404).json({ error: 'Class not found' });
+
+    const newFullClass = grade + className;
+    const oldFullClass = oldClass.grade + oldClass.className;
+
+    // 1. If teacher changed or class name changed, update old teacher
+    if (oldClass.teacherName && (oldClass.teacherName !== teacherName || oldFullClass !== newFullClass)) {
         await User.updateOne(
-            { trueName: data.teacherName, schoolId: data.schoolId }, 
-            { homeroomClass: fullClass }
+            { trueName: oldClass.teacherName, schoolId: sId, homeroomClass: oldFullClass },
+            { homeroomClass: '' }
         );
     }
-    res.json({}); 
+
+    // 2. If new teacher assigned, update their homeroomClass
+    if (teacherName) {
+        // Clear any previous homeroom for this teacher? Assuming one teacher one class
+        await User.updateOne(
+             { trueName: teacherName, schoolId: sId },
+             { homeroomClass: newFullClass }
+        );
+    }
+    
+    // 3. Update Class Record
+    await ClassModel.findByIdAndUpdate(classId, { grade, className, teacherName });
+    
+    // 4. Update Students if class name changed
+    if (oldFullClass !== newFullClass) {
+        await Student.updateMany({ className: oldFullClass, schoolId: sId }, { className: newFullClass });
+    }
+
+    res.json({ success: true });
 });
+
 app.delete('/api/classes/:id', async (req, res) => { 
-    // Deleting a class -> clear teacher's homeroom
     const cls = await ClassModel.findById(req.params.id);
     if (cls && cls.teacherName) {
         const fullClass = cls.grade + cls.className;
-        await User.updateOne(
-            { trueName: cls.teacherName, schoolId: cls.schoolId, homeroomClass: fullClass },
-            { homeroomClass: '' }
-        );
+        await User.updateOne({ trueName: cls.teacherName, schoolId: cls.schoolId, homeroomClass: fullClass }, { homeroomClass: '' });
     }
     await ClassModel.findByIdAndDelete(req.params.id); 
     res.json({}); 
 });
-
 app.get('/api/subjects', async (req, res) => { res.json(await SubjectModel.find(getQueryFilter(req))); });
 app.post('/api/subjects', async (req, res) => { await SubjectModel.create(injectSchoolId(req, req.body)); res.json({}); });
 app.put('/api/subjects/:id', async (req, res) => { await SubjectModel.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/subjects/:id', async (req, res) => { await SubjectModel.findByIdAndDelete(req.params.id); res.json({}); });
-
 app.get('/api/courses', async (req, res) => { res.json(await Course.find(getQueryFilter(req))); });
 app.post('/api/courses', async (req, res) => { await Course.create(injectSchoolId(req, req.body)); res.json({}); });
 app.put('/api/courses/:id', async (req, res) => { await Course.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/courses/:id', async (req, res) => { await Course.findByIdAndDelete(req.params.id); res.json({}); });
-
 app.get('/api/scores', async (req, res) => { res.json(await Score.find(getQueryFilter(req))); });
 app.post('/api/scores', async (req, res) => { await Score.create(injectSchoolId(req, req.body)); res.json({}); });
 app.put('/api/scores/:id', async (req, res) => { await Score.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/scores/:id', async (req, res) => { await Score.findByIdAndDelete(req.params.id); res.json({}); });
-
 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) => { 
     const query = { ...getQueryFilter(req), ...req.query };
-    if (query.grade) {
-        query.className = { $regex: '^' + query.grade };
-        delete query.grade; 
-    }
+    if (query.grade) { query.className = { $regex: '^' + query.grade }; delete query.grade; }
     res.json(await ScheduleModel.find(query)); 
 });
 app.post('/api/schedules', async (req, res) => { 
@@ -659,14 +573,12 @@ app.post('/api/schedules', async (req, res) => {
     res.json({}); 
 });
 app.delete('/api/schedules', async (req, res) => { await ScheduleModel.deleteOne({...getQueryFilter(req), ...req.query}); res.json({}); });
-
 app.get('/api/stats', async (req, res) => { 
     const filter = getQueryFilter(req);
     const studentCount = await Student.countDocuments(filter);
     const courseCount = await Course.countDocuments(filter);
     const scores = await Score.find({...filter, status: 'Normal'});
-    let avgScore = 0;
-    let excellentRate = '0%';
+    let avgScore = 0; let excellentRate = '0%';
     if (scores.length > 0) {
         const total = scores.reduce((sum, s) => sum + s.score, 0);
         avgScore = parseFloat((total / scores.length).toFixed(1));
@@ -675,18 +587,15 @@ app.get('/api/stats', async (req, res) => {
     }
     res.json({ studentCount, courseCount, avgScore, excellentRate });
 });
-
 app.get('/api/config', async (req, res) => { 
-    // When Admin fetches config, we also check auto-gen semester
     const currentSem = getAutoSemester();
     let config = await ConfigModel.findOne({key:'main'});
-    
     if (config) {
         let semesters = config.semesters || [];
         if (!semesters.includes(currentSem)) {
             semesters.unshift(currentSem);
             config.semesters = semesters;
-            config.semester = currentSem; // Auto switch to new sem
+            config.semester = currentSem; 
             await ConfigModel.updateOne({ key: 'main' }, { semesters, semester: currentSem });
         }
     } else {
@@ -695,7 +604,6 @@ app.get('/api/config', async (req, res) => {
     res.json(config); 
 });
 app.post('/api/config', async (req, res) => { await ConfigModel.findOneAndUpdate({key:'main'}, req.body, {upsert:true}); res.json({}); });
-
 app.get('/api/games/mountain', async (req, res) => { res.json(await GameSessionModel.findOne({...getQueryFilter(req), className: req.query.className})); });
 app.post('/api/games/mountain', async (req, res) => { 
     const filter = { className: req.body.className };
@@ -704,25 +612,14 @@ app.post('/api/games/mountain', async (req, res) => {
     await GameSessionModel.findOneAndUpdate(filter, injectSchoolId(req, req.body), {upsert:true}); 
     res.json({}); 
 });
-
 app.post('/api/games/grant-reward', async (req, res) => { 
     const { studentId, count, rewardType, name } = req.body;
     const finalCount = count || 1;
     const finalName = name || (rewardType === 'DRAW_COUNT' ? '抽奖券' : '奖品');
     if (rewardType === 'DRAW_COUNT') await Student.findByIdAndUpdate(studentId, { $inc: { drawAttempts: finalCount } });
-    await StudentRewardModel.create({ 
-        schoolId: req.headers['x-school-id'], 
-        studentId, 
-        studentName: (await Student.findById(studentId)).name, 
-        rewardType, 
-        name: finalName,
-        count: finalCount,
-        status: rewardType === 'DRAW_COUNT' ? 'REDEEMED' : 'PENDING', 
-        source: '教师发放' 
-    });
+    await StudentRewardModel.create({ schoolId: req.headers['x-school-id'], studentId, studentName: (await Student.findById(studentId)).name, rewardType, name: finalName, count: finalCount, status: rewardType === 'DRAW_COUNT' ? 'REDEEMED' : 'PENDING', source: '教师发放' });
     res.json({}); 
 });
-
 app.put('/api/rewards/:id', async (req, res) => { await StudentRewardModel.findByIdAndUpdate(req.params.id, req.body); res.json({}); });
 app.delete('/api/rewards/:id', async (req, res) => {
     const reward = await StudentRewardModel.findById(req.params.id);
@@ -735,7 +632,6 @@ app.delete('/api/rewards/:id', async (req, res) => {
     await StudentRewardModel.findByIdAndDelete(req.params.id);
     res.json({});
 });
-
 app.get('/api/rewards', async (req, res) => { 
     const filter = getQueryFilter(req);
     if(req.query.studentId) filter.studentId = req.query.studentId;
@@ -751,19 +647,14 @@ app.get('/api/rewards', async (req, res) => {
     const list = await StudentRewardModel.find(filter).sort({createTime:-1}).skip(skip).limit(limit);
     res.json({ list, total }); 
 });
-
 app.post('/api/rewards', async (req, res) => { 
     const data = injectSchoolId(req, req.body);
     if (!data.count) data.count = 1;
-    if(data.rewardType==='DRAW_COUNT') { 
-        data.status='REDEEMED'; 
-        await Student.findByIdAndUpdate(data.studentId, {$inc:{drawAttempts:data.count}}); 
-    }
+    if(data.rewardType==='DRAW_COUNT') { data.status='REDEEMED'; await Student.findByIdAndUpdate(data.studentId, {$inc:{drawAttempts:data.count}}); }
     await StudentRewardModel.create(data); 
     res.json({}); 
 });
 app.post('/api/rewards/:id/redeem', async (req, res) => { await StudentRewardModel.findByIdAndUpdate(req.params.id, {status:'REDEEMED'}); res.json({}); });
-
 app.get('/api/attendance', async (req, res) => {
     const { className, date, studentId } = req.query;
     const filter = getQueryFilter(req);
@@ -800,7 +691,6 @@ app.post('/api/leave', async (req, res) => {
     if (student) await AttendanceModel.findOneAndUpdate({ studentId, date: startDate }, { schoolId: req.headers['x-school-id'], studentId, studentName: student.name, className: student.className, date: startDate, status: 'Leave', checkInTime: new Date() }, { upsert: true });
     res.json({ success: true });
 });
-
 app.post('/api/batch-delete', async (req, res) => { 
     if(req.body.type==='student') await Student.deleteMany({_id:{$in:req.body.ids}});
     if(req.body.type==='score') await Score.deleteMany({_id:{$in:req.body.ids}});