Upload 45 files

pages/CourseList.tsx

@@ -51,8 +51,16 @@ export const CourseList: React.FC = () => {
       setCourses(filteredCourses);
       setSubjects(s);
       setTeachers(t);
-      // Safety check and sort
-      setClasses(Array.isArray(cls) ? cls.sort(sortClasses) : []);
+      
+      // Safety check: Ensure cls is array and sort safely
+      const safeClasses = Array.isArray(cls) ? cls : [];
+      try {
+          safeClasses.sort(sortClasses);
+      } catch (e) {
+          console.warn("Class sort failed", e);
+      }
+      setClasses(safeClasses);
+
     } catch (e) { console.error(e); } finally { setLoading(false); }
   };
 
@@ -106,6 +114,12 @@ export const CourseList: React.FC = () => {
       setIsModalOpen(true);
   };
 
+  // Helper to ensure class name is consistent
+  const getFullClassName = (c: ClassInfo) => {
+      if (c.className && c.grade && c.className.startsWith(c.grade)) return c.className;
+      return (c.grade || '') + (c.className || '');
+  };
+
   return (
     <div className="space-y-6">
        <div className="flex flex-col md:flex-row justify-between items-center gap-4">
@@ -188,7 +202,10 @@ export const CourseList: React.FC = () => {
                       <label className="text-sm font-bold text-gray-500 mb-1 block">教学班级</label>
                       <select className="w-full border p-2 rounded-lg focus:ring-2 focus:ring-indigo-500 outline-none" value={formData.className} onChange={e=>setFormData({...formData, className:e.target.value})} required>
                          <option value="">-- 选择班级 --</option>
-                         {classes.map(cls => <option key={cls._id} value={cls.grade + cls.className}>{cls.grade}{cls.className}</option>)}
+                         {classes.map(cls => {
+                             const fullName = getFullClassName(cls);
+                             return <option key={cls._id} value={fullName}>{fullName}</option>;
+                         })}
                       </select>
                    </div>
 

pages/Dashboard.tsx

@@ -20,27 +20,33 @@ export const sortGrades = (a: string, b: string) => (gradeOrder[a] || 99) - (gra
 
 // Helper to extract grade from class string (e.g. "一年级(1)班" -> "一年级")
 const extractGrade = (s: string) => {
+    if (!s) return '';
     const keys = Object.keys(gradeOrder);
-    // Sort keys by length desc to match "七年级" before "七" if needed, though simple find is usually ok
     return keys.find(g => s.startsWith(g)) || '';
 };
 
-export const sortClasses = (a: string, b: string) => {
+// Robust sort function
+export const sortClasses = (a: ClassInfo | string, b: ClassInfo | string) => {
+    // Handle both ClassInfo objects and string names
+    const nameA = typeof a === 'string' ? a : (a.grade + a.className);
+    const nameB = typeof b === 'string' ? b : (b.grade + b.className);
+    
+    if (!nameA || !nameB) return 0;
+
     // 1. Sort by Grade First
-    const gradeA = extractGrade(a);
-    const gradeB = extractGrade(b);
+    const gradeA = extractGrade(nameA);
+    const gradeB = extractGrade(nameB);
     
     if (gradeA && gradeB && gradeA !== gradeB) {
         return sortGrades(gradeA, gradeB);
     }
 
-    // 2. Sort by Class Number (extract digits inside parens or generally)
-    // Matches (1) or 1班
+    // 2. Sort by Class Number
     const getNum = (str: string) => {
         const match = str.match(/(\d+)/);
         return match ? parseInt(match[1]) : 0;
     };
-    return getNum(a) - getNum(b);
+    return getNum(nameA) - getNum(nameB);
 };
 
 export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
@@ -86,14 +92,17 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
           api.users.getAll({ role: 'TEACHER' })
         ]);
         setStats(summary);
-        setClassList(classes);
+        
+        // Safety check for classes
+        const safeClasses = Array.isArray(classes) ? classes : [];
+        setClassList(safeClasses);
+        
         setSubjects(subs);
         setTeachers(userList);
 
-        if (isAdmin && classes.length > 0) {
-            const grades = Array.from(new Set((classes as ClassInfo[]).map((c: ClassInfo) => c.grade))).sort(sortGrades);
+        if (isAdmin && safeClasses.length > 0) {
+            const grades = Array.from(new Set(safeClasses.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);
             }
         }
@@ -190,11 +199,15 @@ export const Dashboard: React.FC<DashboardProps> = ({ onNavigate }) => {
 
   const uniqueGrades = Array.from(new Set(classList.map(c => c.grade))).sort(sortGrades);
   
-  // Filter class options in the modal based on currently selected viewGrade (if Admin)
-  // Ensure strict sorting
-  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);
+  // Robust class mapping for modal
+  const modalClassOptions = classList
+      .filter(c => !isAdmin || !viewGrade || c.grade === viewGrade)
+      .map(c => ({
+          id: c._id,
+          name: (c.className.startsWith(c.grade) ? c.className : c.grade + c.className)
+      }))
+      .sort((a,b) => sortClasses(a.name, b.name))
+      .map(c => c.name);
 
   const cards = [
     { label: '在校学生', value: stats.studentCount, icon: Users, color: 'bg-blue-500', trend: '实时' },

pages/Games.tsx

@@ -29,6 +29,13 @@ export const Games: React.FC = () => {
       loadContext();
   }, []);
 
+  const getFullClassName = (c: ClassInfo) => {
+      // Logic to prevent double grade names like "一年级一年级(1)班"
+      // If className already starts with grade, use it as is.
+      if (c.className && c.grade && c.className.startsWith(c.grade)) return c.className;
+      return (c.grade || '') + (c.className || '');
+  };
+
   const loadContext = async () => {
       if (isTeacher) {
           try {
@@ -36,7 +43,7 @@ export const Games: React.FC = () => {
               const allClasses = await api.classes.getAll();
               const homerooms = allClasses
                   .filter((c: ClassInfo) => c.homeroomTeacherIds?.includes(currentUser._id || '') || c.teacherName?.includes(currentUser.trueName || currentUser.username))
-                  .map((c: ClassInfo) => c.grade + c.className);
+                  .map(getFullClassName);
 
               // Fetch Courses where I am Subject Teacher
               const allCourses = await api.courses.getAll();