Upload 45 files

pages/AchievementStudent.tsx

@@ -1,7 +1,7 @@
 
 import React, { useState, useEffect } from 'react';
 import { api } from '../services/api';
-import { AchievementConfig, AchievementItem, Student, StudentAchievement, SystemConfig, TeacherExchangeConfig } from '../types';
+import { AchievementConfig, AchievementItem, Student, StudentAchievement, SystemConfig, TeacherExchangeConfig, User } from '../types';
 import { Award, ShoppingBag, Loader2, Calendar, Lock } from 'lucide-react';
 import { Emoji } from '../components/Emoji';
 
@@ -11,6 +11,7 @@ export const AchievementStudent: React.FC = () => {
     const [config, setConfig] = useState<AchievementConfig | null>(null);
     const [teacherRules, setTeacherRules] = useState<TeacherExchangeConfig[]>([]);
     const [myAchievements, setMyAchievements] = useState<StudentAchievement[]>([]);
+    const [availableTeachers, setAvailableTeachers] = useState<User[]>([]); // To resolve teacher names
     
     // UI State
     const [activeTab, setActiveTab] = useState<'wall' | 'shop'>('wall');
@@ -19,6 +20,17 @@ export const AchievementStudent: React.FC = () => {
 
     const currentUser = api.auth.getCurrentUser();
 
+    // Helper to format polite teacher name
+    const formatTeacherName = (t: User | undefined) => {
+        if (!t) return '未知老师';
+        const name = t.trueName || t.username;
+        const surname = name.charAt(0);
+        // Use teachingSubject if available, otherwise just Surname + Teacher. 
+        // Do not default to "科任".
+        const subject = t.teachingSubject;
+        return subject ? `${subject}-${surname}老师` : `${surname}老师`;
+    };
+
     useEffect(() => {
         loadData();
     }, [selectedSemester]);
@@ -52,6 +64,7 @@ export const AchievementStudent: React.FC = () => {
                 // Fetch Teacher Rules
                 // Get ALL associated teachers (Homeroom + Course teachers)
                 const teachers = await api.users.getTeachersForClass(me.className);
+                setAvailableTeachers(teachers); // Save for formatting
                 const teacherIds = teachers.map((t: any) => t._id);
                 
                 if (teacherIds.length > 0) {
@@ -204,11 +217,16 @@ export const AchievementStudent: React.FC = () => {
                                 <p className="text-xs mt-2">请提醒你的任课老师在“成就管理-兑换规则”中添加奖品哦！</p>
                             </div>
                         ) : (
-                            teacherRules.map(teacherConfig => (
+                            teacherRules.map(teacherConfig => {
+                                // Resolve teacher info to get subject
+                                const teacherObj = availableTeachers.find(t => t._id === teacherConfig.teacherId);
+                                const displayName = teacherObj ? formatTeacherName(teacherObj) : teacherConfig.teacherName;
+
+                                return (
                                 teacherConfig.rules.length > 0 && (
                                     <div key={teacherConfig.teacherId} className="bg-white rounded-xl border border-gray-200 p-6 shadow-sm">
                                         <h3 className="font-bold text-lg text-gray-800 mb-4 border-b pb-2 flex items-center">
-                                            🛍️ {teacherConfig.teacherName} 的兑换店
+                                            🛍️ {displayName} 的兑换店
                                         </h3>
                                         <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
                                             {teacherConfig.rules.map(rule => {
@@ -235,7 +253,7 @@ export const AchievementStudent: React.FC = () => {
                                         </div>
                                     </div>
                                 )
-                            ))
+                            )})
                         )}
                     </div>
                 )}

pages/GameLucky.tsx

@@ -91,8 +91,10 @@ export const GameLucky: React.FC<{className?: string}> = ({ className }) => {
       if (!t) return '未知老师';
       const name = t.trueName || t.username;
       const surname = name.charAt(0);
-      const subject = t.teachingSubject || '科任';
-      return `${subject}-${surname}老师`;
+      // Use teachingSubject if available, otherwise just Surname + Teacher. 
+      // Do not default to "科任".
+      const subject = t.teachingSubject;
+      return subject ? `${subject}-${surname}老师` : `${surname}老师`;
   };
 
   useEffect(() => {

server.js

@@ -157,7 +157,8 @@ app.get('/api/classes/:className/teachers', async (req, res) => {
 
         if (teacherIds.size === 0) return res.json([]);
 
-        const teachers = await User.find({ _id: { $in: Array.from(teacherIds) } }, 'trueName username _id');
+        // UPDATED: Include teachingSubject in the response
+        const teachers = await User.find({ _id: { $in: Array.from(teacherIds) } }, 'trueName username _id teachingSubject');
         res.json(teachers);
     } catch (e) {
         console.error("Error fetching teachers", e);