Upload 10 files

src/views/InstructorView.js

@@ -612,7 +612,7 @@ export function setupInstructorEvents() {
             if (confirm('確定要退回此學員的進度嗎？學員將需要重新作答。')) {
                 try {
                     const { resetProgress } = await import("../services/classroom.js");
-                    await resetProgress(roomCode, userId, challengeId);
+                    await resetProgress(userId, roomCode, challengeId);
                     alert('已成功退回，學員將需要重新作答。');
                     window.closeBroadcastModal();
                 } catch (e) {

src/views/StudentView.js

@@ -326,19 +326,14 @@ export async function renderStudentView() {
     // Setup Real-time Subscription
     if (window.currentProgressUnsub) window.currentProgressUnsub();
     window.currentProgressUnsub = subscribeToUserProgress(userId, (newProgressMap) => {
-        // Merge updates
-        const updatedProgress = { ...userProgress, ...newProgressMap };
+        // Merge updates (Actually newProgressMap is complete source of truth from firestore listener)
+        const updatedProgress = newProgressMap;
 
-        // Smart Update: Check if visual refresh is needed
+        // 1. Update Monster (Visuals)
         const newState = calculateMonsterState(updatedProgress, classSize, userProfile);
         const fixedContainer = document.getElementById('monster-container-fixed');
         const currentMonsterId = fixedContainer?.getAttribute('data-monster-id');
 
-        // Tolerance for scale check usually not needed if we want scale to update visuals immediately?
-        // Actually, scale change usually means totalCompleted changed.
-        // If we want smooth growth, replacing DOM resets animation which looks slight jumpy but acceptable.
-        // But the user complained about "position reset" (walk cycle reset).
-
         if (fixedContainer && String(currentMonsterId) === String(newState.monster.id)) {
             // Monster ID is same (no evolution/devolution).
             // Just update stats tooltip
@@ -347,29 +342,36 @@ export async function renderStudentView() {
                 statsContainer.innerHTML = renderMonsterStats(newState);
             }
 
-            // What if level up (scale change)?
-            // If we don't replace DOM, scale won't update in style attribute.
-            // We should update the style manually.
-            const artContainer = fixedContainer.querySelector('.pixel-art-container');
-            if (artContainer && newState.currentScale) {
-                // Update animation with new scale
-                // Note: Modifying 'transform' directly might conflict with keyframes unless keyframes use relative or we update style variable.
-                // Keyframes use: scale(${currentScale}). This is hardcoded in specific keyframes string in <style>.
-                // We can't easily update keyframes dynamic values without replacing style block.
-
-                // If totalCompleted changed (level up), user *might* accept a reset because they levelled up.
-                // But simply giving a heart shouldn't reset.
-
-                const oldTotal = parseInt(fixedContainer.querySelector('.bg-gray-900\\/90')?.textContent?.replace('Lv.', '') || '1') - 1;
-                if (oldTotal !== newState.totalCompleted) {
-                    // Level changed -> Scale changed -> Re-render full (reset animation is fine for Level Up)
-                    monsterContainer.innerHTML = renderMonsterSection(updatedProgress, classSize, userProfile);
-                }
+            // Check level up (totalCompleted) to update scale/animation if needed
+            const oldTotal = parseInt(fixedContainer.querySelector('.bg-gray-900\\/90')?.textContent?.replace('Lv.', '') || '1') - 1;
+            if (oldTotal !== newState.totalCompleted) {
+                monsterContainer.innerHTML = renderMonsterSection(updatedProgress, classSize, userProfile);
             }
         } else {
-            // Monster changed or clean slate -> Full Render
+            // Full Monster Render
             monsterContainer.innerHTML = renderMonsterSection(updatedProgress, classSize, userProfile);
         }
+
+        // 2. Update Task List (Accordions) - Realtime "Reject" support
+        const levelGroups = {
+            beginner: cachedChallenges.filter(c => c.level === 'beginner'),
+            intermediate: cachedChallenges.filter(c => c.level === 'intermediate'),
+            advanced: cachedChallenges.filter(c => c.level === 'advanced')
+        };
+        const levelNames = {
+            beginner: "初級 (Beginner)",
+            intermediate: "中級 (Intermediate)",
+            advanced: "高級 (Advanced)"
+        };
+
+        ['beginner', 'intermediate', 'advanced'].forEach(level => {
+            const detailEl = document.getElementById(`details-group-${level}`);
+            if (detailEl) {
+                // renderLevelGroup checks existing DOM for 'open' state, so it persists
+                const newHTML = renderLevelGroup(level, levelGroups[level], updatedProgress, levelNames);
+                detailEl.outerHTML = newHTML;
+            }
+        });
     });
 
     // Accordion Layout