Upload 51 files

pages/TeacherDashboard.tsx

@@ -44,7 +44,7 @@ export const TeacherDashboard: React.FC = () => {
   
   // Modals & Editing
   const [editingCell, setEditingCell] = useState<{day: number, period: number} | null>(null);
-  const [editForm, setEditForm] = useState({ subject: '', teacherName: '', weekType: 'ALL' });
+  const [editForm, setEditForm] = useState<{ _id?: string, subject: string, teacherName: string, weekType: string }>({ subject: '', teacherName: '', weekType: 'ALL' });
   const [isPeriodSettingsOpen, setIsPeriodSettingsOpen] = useState(false);
   const [tempPeriodConfig, setTempPeriodConfig] = useState<PeriodConfig[]>([]);
 
@@ -103,38 +103,56 @@ export const TeacherDashboard: React.FC = () => {
     finally { setLoading(false); }
   };
 
-  const handleCellClick = (day: number, period: number) => {
-      // Find existing schedule for this slot
-      const existingSlot = schedules.find(s => 
-          s.dayOfWeek === day && 
-          s.period === period &&
-          (s.weekType === 'ALL' || s.weekType === weekType || weekType === 'ALL')
-      );
-
-      if (existingSlot) {
+  const handleCellClick = (day: number, period: number, specificSchedule?: Schedule) => {
+      setEditingCell({ day, period });
+      
+      if (specificSchedule) {
+          // Edit existing specific schedule
           setEditForm({
-              subject: existingSlot.subject,
-              teacherName: existingSlot.teacherName,
-              weekType: existingSlot.weekType || 'ALL'
+              _id: specificSchedule._id,
+              subject: specificSchedule.subject,
+              teacherName: specificSchedule.teacherName,
+              weekType: specificSchedule.weekType || 'ALL'
           });
       } else {
-          setEditForm({ subject: '', teacherName: '', weekType: weekType === 'ALL' ? 'ALL' : weekType });
+          // Add new schedule (default to current view mode, or ALL if in ALL view)
+          setEditForm({ 
+              subject: '', 
+              teacherName: '', 
+              weekType: weekType === 'ALL' ? 'ALL' : weekType 
+          });
       }
-      setEditingCell({ day, period });
   };
 
   const handleSaveSchedule = async () => {
       if (!homeroomClass || !editingCell) return;
       if (!editForm.subject) return alert('请选择科目');
+      
       try {
-          await api.schedules.save({
+          const payload = {
               className: homeroomClass,
               dayOfWeek: editingCell.day,
               period: editingCell.period,
               subject: editForm.subject,
               teacherName: editForm.teacherName,
               weekType: editForm.weekType as any
-          });
+          };
+
+          if (editForm._id) {
+              // Update existing by ID
+              await fetch(`/api/schedules/${editForm._id}`, {
+                  method: 'PUT',
+                  headers: { 
+                      'Content-Type': 'application/json',
+                      'x-school-id': localStorage.getItem('admin_view_school_id') || ''
+                  },
+                  body: JSON.stringify(payload)
+              });
+          } else {
+              // Create new
+              await api.schedules.save(payload);
+          }
+
           setEditingCell(null);
           const updated = await api.schedules.get({ className: homeroomClass });
           setSchedules(updated);
@@ -145,10 +163,15 @@ export const TeacherDashboard: React.FC = () => {
       setConfirmModal({
           isOpen: true,
           title: '删除课程',
-          message: `确定要删除 ${s.subject} 吗？`,
+          message: `确定要删除 ${s.subject} (${s.weekType==='ODD'?'单周':s.weekType==='EVEN'?'双周':'全周'}) 吗？`,
           isDanger: true,
           onConfirm: async () => {
-              await api.schedules.delete({ className: s.className, dayOfWeek: s.dayOfWeek, period: s.period });
+              // Use ID based delete if available, otherwise fallback to old query
+              if (s._id) {
+                  await fetch(`/api/schedules?id=${s._id}`, { method: 'DELETE', headers: { 'x-school-id': localStorage.getItem('admin_view_school_id') || '' } });
+              } else {
+                  await api.schedules.delete({ className: s.className, dayOfWeek: s.dayOfWeek, period: s.period });
+              }
               const updated = await api.schedules.get({ className: homeroomClass });
               setSchedules(updated);
           }
@@ -336,11 +359,14 @@ export const TeacherDashboard: React.FC = () => {
                                             <div className="text-[10px] text-gray-400 font-normal mt-1">{pConfig.startTime ? `${pConfig.startTime}-${pConfig.endTime}` : ''}</div>
                                         </td>
                                         {[1,2,3,4,5].map(day => {
+                                            // Enhanced filter: support displaying simultaneous odd/even records
                                             const slotItems = schedules.filter(s => 
                                                 s.dayOfWeek === day && 
-                                                s.period === pConfig.period && 
-                                                (s.weekType === 'ALL' || s.weekType === weekType || weekType === 'ALL')
-                                            );
+                                                s.period === pConfig.period
+                                            ).filter(s => {
+                                                if (weekType === 'ALL') return true;
+                                                return s.weekType === 'ALL' || s.weekType === weekType;
+                                            });
                                             
                                             return (
                                                 <td key={day} className="border-b border-r p-1 align-top h-24 relative group hover:bg-blue-50/50 transition-colors cursor-pointer" onClick={() => handleCellClick(day, pConfig.period)}>
@@ -350,12 +376,12 @@ export const TeacherDashboard: React.FC = () => {
                                                                 key={item._id} 
                                                                 className="p-1.5 rounded-md text-xs border shadow-sm relative group/item transition-transform hover:scale-[1.02]"
                                                                 style={{backgroundColor: stringToColor(item.subject), borderColor: 'rgba(0,0,0,0.05)'}}
-                                                                onClick={(e) => { e.stopPropagation(); handleCellClick(day, pConfig.period); }}
+                                                                onClick={(e) => { e.stopPropagation(); handleCellClick(day, pConfig.period, item); }}
                                                             >
                                                                 <div className="font-bold text-gray-800 truncate">{item.subject}</div>
                                                                 <div className="flex justify-between items-center text-[10px] text-gray-600 mt-0.5">
                                                                     <span className="truncate max-w-[60px]">{item.teacherName}</span>
-                                                                    {item.weekType !== 'ALL' && <span className="bg-white/60 px-1 rounded text-[9px] font-bold border border-black/5">{item.weekType==='ODD'?'单':'双'}</span>}
+                                                                    {item.weekType !== 'ALL' && <span className={`px-1 rounded text-[9px] font-bold border border-black/5 ${item.weekType==='ODD'?'bg-blue-100 text-blue-700':'bg-green-100 text-green-700'}`}>{item.weekType==='ODD'?'单':'双'}</span>}
                                                                 </div>
                                                                 <button 
                                                                     onClick={(e) => { e.stopPropagation(); handleDeleteSchedule(item); }}
@@ -383,7 +409,7 @@ export const TeacherDashboard: React.FC = () => {
         {editingCell && (
             <div className="fixed inset-0 bg-black/30 z-[100] flex items-center justify-center p-4 backdrop-blur-sm">
                 <div className="bg-white p-6 rounded-xl shadow-2xl w-full max-w-sm animate-in zoom-in-95">
-                    <h4 className="font-bold mb-4 text-gray-800 text-lg border-b pb-2">编辑课程信息</h4>
+                    <h4 className="font-bold mb-4 text-gray-800 text-lg border-b pb-2">{editForm._id ? '编辑课程信息' : '新增课程信息'}</h4>
                     <div className="space-y-4">
                         <div>
                             <label className="text-xs font-bold text-gray-500 uppercase block mb-1">科目</label>

server.js

@@ -47,6 +47,15 @@ const connectDB = async () => {
   try {
     await mongoose.connect(MONGO_URI, { serverSelectionTimeoutMS: 30000 });
     console.log('✅ MongoDB 连接成功 (Real Data)');
+    
+    // FIX: Drop the restrictive index that prevents multiple schedules per slot
+    try {
+        await ScheduleModel.collection.dropIndex('schoolId_1_className_1_dayOfWeek_1_period_1');
+        console.log('✅ Dropped restrictive schedule index');
+    } catch (e) {
+        // Ignore error if index doesn't exist
+    }
+
   } catch (err) {
     console.error('❌ MongoDB 连接失败:', err.message);
     InMemoryDB.isFallback = true;
@@ -140,12 +149,26 @@ app.get('/api/schedules', async (req, res) => {
     res.json(await ScheduleModel.find(query)); 
 });
 
+// NEW: Update by ID (Exact Update)
+app.put('/api/schedules/:id', async (req, res) => {
+    try {
+        await ScheduleModel.findByIdAndUpdate(req.params.id, req.body);
+        res.json({ success: true });
+    } catch (e) {
+        res.status(500).json({ error: e.message });
+    }
+});
+
+// Create or Update by Logic (Upsert)
 app.post('/api/schedules', async (req, res) => { 
     try {
-        // FIX: Removed weekType from filter to prevent Duplicate Key Error on existing unique index.
-        // The DB index is (schoolId, className, dayOfWeek, period).
-        // This means we can only have one schedule per slot. Updating weekType should update the existing slot.
-        const filter = { className:req.body.className, dayOfWeek:req.body.dayOfWeek, period:req.body.period }; 
+        // Updated Filter: Include weekType to allow separate ODD/EVEN records for same slot
+        const filter = { 
+            className: req.body.className, 
+            dayOfWeek: req.body.dayOfWeek, 
+            period: req.body.period,
+            weekType: req.body.weekType || 'ALL'
+        }; 
         const sId = req.headers['x-school-id']; 
         if(sId) filter.schoolId = sId; 
         
@@ -159,7 +182,12 @@ app.post('/api/schedules', async (req, res) => {
 
 app.delete('/api/schedules', async (req, res) => { 
     try {
-        await ScheduleModel.deleteOne({...getQueryFilter(req), ...req.query}); 
+        // Support deleting by ID if provided
+        if (req.query.id) {
+            await ScheduleModel.findByIdAndDelete(req.query.id);
+        } else {
+            await ScheduleModel.deleteOne({...getQueryFilter(req), ...req.query}); 
+        }
         res.json({}); 
     } catch (e) {
         res.status(500).json({ error: e.message });
@@ -173,7 +201,7 @@ app.put('/api/users/:id/menu-order', async (req, res) => {
     res.json({ success: true });
 });
 
-// --- Existing Routes (Minimally Modified) ---
+// ... (Rest of existing routes unchanged) ...
 app.get('/api/classes/:className/teachers', async (req, res) => {
     const { className } = req.params;
     const schoolId = req.headers['x-school-id'];