Upload 9 files

src/services/classroom.js

@@ -464,10 +464,15 @@ export async function getClassSize(roomCode) {
  * @param {number} newStage
  * @param {string} monsterId (Optional, for persisting specific form)
  */
-export async function updateUserMonster(userId, newStage, monsterId = null) {
+export async function updateUserMonster(userId, newStage, monsterId = undefined) {
     const userRef = doc(db, USERS_COLLECTION, userId);
     const data = { monster_stage: newStage };
-    if (monsterId) data.monster_id = monsterId;
+    // If monsterId is explicitly provided (including null/empty string), update it.
+    // If undefined, leave as is. 
+    // We want to allow clearing it (null) or setting 'Egg'.
+    if (monsterId !== undefined) {
+        data.monster_id = monsterId;
+    }
 
     await updateDoc(userRef, data);
 }

src/views/StudentView.js

@@ -155,12 +155,19 @@ export async function renderStudentView() {
 
         // Regression Logic Check
         if (actualStage > potentialStage) {
-            updateUserMonster(userId, potentialStage, null).then(() => {
+            // Regression Logic: Pass 'Egg' (or null) to enforce downgrade
+            const targetId = potentialStage === 0 ? 'Egg' : null; // If going to 0, force Egg. Else keep null to let system decide? Or should we query?
+            // Actually, if we devolve, we lose the specific form. So we should probably reset ID to something generic or clear it.
+            // If we go to stage 0, 'Egg' is safe.
+            // If we go to stage 1 (from 2), we might want to keep the stage 1 form (if we knew it).
+            // But simplifying: just clear the ID so getNextMonster picks default for that stage.
+
+            updateUserMonster(userId, potentialStage, targetId).then(() => {
                 setTimeout(() => window.location.reload(), 500);
             });
             // Return corrected state temporary
             return {
-                ...calculateMonsterState(currentUserProgress, classSize, { ...userProfile, monster_stage: potentialStage }),
+                ...calculateMonsterState(currentUserProgress, classSize, { ...userProfile, monster_stage: potentialStage, monster_id: targetId }),
                 isRegressing: true
             };
         }