Upload 53 files

components/ConfirmModal.tsx

@@ -22,7 +22,7 @@ export const ConfirmModal: React.FC<ConfirmModalProps> = ({
 
   const handleConfirm = () => {
       onConfirm();
-      onClose(); // Automatically close modal after confirmation
+      onClose();
   };
 
   return (

pages/AchievementTeacher.tsx

@@ -5,6 +5,7 @@ import { AchievementConfig, AchievementItem, ExchangeRule, Student, TeacherExcha
 import { Plus, Trash2, Edit, Save, Gift, Award, Coins, Users, Search, Loader2, CheckCircle, Filter } from 'lucide-react';
 import { Emoji } from '../components/Emoji';
 import { ConfirmModal } from '../components/ConfirmModal';
+import { NumberInput } from '../components/NumberInput';
 
 const PRESET_ICONS = [
     { icon: '🏆', label: '冠军杯' }, { icon: '🥇', label: '金牌' }, { icon: '🥈', label: '银牌' }, { icon: '🥉', label: '铜牌' },
@@ -161,7 +162,7 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                         <div className="flex justify-end items-center gap-2"><span className="text-xs font-bold text-gray-500"><Filter size={14} className="inline mr-1"/>筛选添加者:</span><select className="border rounded text-xs p-1" value={filterCreator} onChange={e=>setFilterCreator(e.target.value)}><option value="ALL">全部老师</option>{uniqueCreators.map(c => <option key={c} value={c}>{c}</option>)}</select></div>
                         <div className="bg-blue-50 p-4 rounded-xl border border-blue-100 flex flex-col md:flex-row gap-4 items-end">
                             <div className="flex-1 w-full"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">成就名称</label><input className="w-full border rounded p-2 text-sm" placeholder="如: 劳动小能手" value={newAchieve.name} onChange={e => setNewAchieve({...newAchieve, name: e.target.value})} /></div>
-                            <div className="w-full md:w-32"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">分值 (小红花)</label><input type="number" min={1} className="w-full border rounded p-2 text-sm" value={newAchieve.points} onChange={e => setNewAchieve({...newAchieve, points: Number(e.target.value)})} /></div>
+                            <div className="w-full md:w-32"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">分值 (小红花)</label><NumberInput min={1} className="w-full" value={newAchieve.points} onChange={v => setNewAchieve({...newAchieve, points: v})} /></div>
                             <div className="w-full md:w-auto"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">图标预设</label><select className="w-full border rounded p-2 min-w-[100px] text-sm bg-white" value={newAchieve.icon} onChange={e => setNewAchieve({...newAchieve, icon: e.target.value})}>{PRESET_ICONS.map(p => <option key={p.label} value={p.icon}>{p.icon} {p.label}</option>)}</select></div>
                             <button onClick={addAchievement} className="bg-blue-600 text-white px-4 py-2 rounded-lg font-bold hover:bg-blue-700 whitespace-nowrap text-sm">添加成就</button>
                         </div>
@@ -223,10 +224,10 @@ export const AchievementTeacher: React.FC<{className?: string}> = ({ className }
                     <div className="space-y-6 max-w-4xl mx-auto">
                         <div className="bg-purple-50 p-4 rounded-lg border border-purple-100 text-sm text-purple-800 mb-4"><span className="font-bold">提示：</span> 这里的兑换规则是您个人专属的，对您教的所有班级学生可见。学生兑换后，只有您能看到待处理的申请。</div>
                         <div className="bg-green-50 p-4 rounded-xl border border-green-100 flex flex-col md:flex-row gap-4 items-end">
-                            <div className="w-full md:w-32"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">消耗小红花</label><input type="number" min={1} className="w-full border rounded p-2 text-sm" value={newRule.cost} onChange={e => setNewRule({...newRule,cost: Number(e.target.value)})}/></div>
+                            <div className="w-full md:w-32"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">消耗小红花</label><NumberInput min={1} className="w-full" value={newRule.cost} onChange={v => setNewRule({...newRule,cost: v})}/></div>
                             <div className="w-full md:w-32"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">奖励类型</label><select className="w-full border rounded p-2 text-sm bg-white" value={newRule.rewardType} onChange={e => setNewRule({...newRule, rewardType: e.target.value as any})}><option value="DRAW_COUNT">🎲 抽奖券</option><option value="ITEM">🎁 实物/特权</option></select></div>
                             <div className="flex-1 w-full"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">奖励名称</label><input className="w-full border rounded p-2 text-sm" placeholder="如: 免作业券" value={newRule.rewardName} onChange={e => setNewRule({...newRule, rewardName: e.target.value})}/></div>
-                            <div className="w-24"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">数量</label><input type="number" min={1} className="w-full border rounded p-2 text-sm" value={newRule.rewardValue} onChange={e => setNewRule({...newRule, rewardValue: Number(e.target.value)})}/></div>
+                            <div className="w-24"><label className="text-xs font-bold text-gray-500 uppercase mb-1 block">数量</label><NumberInput min={1} className="w-full" value={newRule.rewardValue} onChange={v => setNewRule({...newRule, rewardValue: v})}/></div>
                             <button onClick={addRule} className="bg-green-600 text-white px-4 py-2 rounded-lg font-bold hover:bg-green-700 whitespace-nowrap text-sm">添加规则</button>
                         </div>
                         <div className="space-y-3">{myRules.length === 0 ? <div className="text-center text-gray-400 py-4">暂无个人兑换规则</div> : myRules.map(rule => (

pages/Attendance.tsx

@@ -149,45 +149,62 @@ export const AttendancePage: React.FC = () => {
       });
   };
 
-  // Toggle Day Type (Workday <-> Holiday/Off)
+  // Improved Logic: Smart Toggle Day Type
   const toggleDayType = async () => {
-      if (isHoliday) {
-          // Current is Holiday -> Set to Workday
-          setConfirmModal({
-              isOpen: true,
-              title: '开启考勤',
-              message: `确定将 ${date} 设为“工作日”并开启考勤吗？\n(此操作将覆盖周末或假期的免打卡状态)`,
-              onConfirm: async () => {
-                  await api.calendar.add({
-                      schoolId: currentUser?.schoolId!,
-                      className: targetClass,
-                      type: 'WORKDAY',
-                      startDate: date,
-                      endDate: date,
-                      name: '补班/工作日'
-                  });
-                  loadData();
-              }
-          });
-      } else {
-          // Current is Workday -> Set to Off
-          setConfirmModal({
-              isOpen: true,
-              title: '关闭考勤',
-              message: `确定将 ${date} 标记为“休息日”并免除考勤吗？`,
-              onConfirm: async () => {
-                  await api.calendar.add({
-                      schoolId: currentUser?.schoolId!,
-                      className: targetClass,
-                      type: 'OFF',
-                      startDate: date,
-                      endDate: date,
-                      name: '休息/停课'
-                  });
+      const isCurrentlyHoliday = isHoliday; // Based on calculation
+      const targetIsWorkday = isCurrentlyHoliday; // If currently holiday, we want to make it workday
+      
+      const confirmMsg = targetIsWorkday 
+          ? `确定将 ${date} 设为“工作日”并开启考勤吗？` 
+          : `确定将 ${date} 标记为“休息日”并免除考勤吗？`;
+
+      setConfirmModal({
+          isOpen: true,
+          title: targetIsWorkday ? '开启考勤' : '关闭考勤',
+          message: confirmMsg,
+          onConfirm: async () => {
+              try {
+                  // 1. Find overlapping single-day entries and delete them
+                  const overlapping = calendarEntries.filter(e => e.startDate === date && e.endDate === date);
+                  for (const entry of overlapping) {
+                      if (entry._id) await api.calendar.delete(entry._id);
+                  }
+
+                  // 2. Check default state (Weekend vs Weekday)
+                  const dayOfWeek = new Date(date).getDay();
+                  const isDefaultHoliday = excludeWeekends && (dayOfWeek === 0 || dayOfWeek === 6);
+
+                  // 3. Add new entry ONLY if target state differs from default state
+                  if (targetIsWorkday && isDefaultHoliday) {
+                      // It's a weekend, but we want Workday -> Add WORKDAY exception
+                      await api.calendar.add({
+                          schoolId: currentUser?.schoolId!,
+                          className: targetClass,
+                          type: 'WORKDAY',
+                          startDate: date,
+                          endDate: date,
+                          name: '补班/工作日'
+                      });
+                  } else if (!targetIsWorkday && !isDefaultHoliday) {
+                      // It's a weekday, but we want Holiday -> Add OFF exception
+                      await api.calendar.add({
+                          schoolId: currentUser?.schoolId!,
+                          className: targetClass,
+                          type: 'OFF',
+                          startDate: date,
+                          endDate: date,
+                          name: '休息/停课'
+                      });
+                  }
+                  // If target state matches default (e.g. making Monday a Workday), we just deleted the 'OFF' exception above, so it reverts to default Workday.
+
+                  setToast({ show: true, message: '日程已更新', type: 'success' });
                   loadData();
+              } catch (e) {
+                  setToast({ show: true, message: '操作失败', type: 'error' });
               }
-          });
-      }
+          }
+      });
   };
 
   if (!targetClass) return <div className="p-10 text-center text-gray-500">您不是班主任，无法管理考勤。</div>;