Update app.py

app.py

@@ -651,28 +651,40 @@ def join_game(game_id, username, avatar):
 
     return ok, msg
 
+def compute_score(questions, answers, times=None):
+    """
+    Compute the total score and correctness flags for each question.
 
-def compute_score(questions, answers, times):
-    total = 0
+    Args:
+        questions (list): List of question dicts. Each dict must have 'answer' key.
+        answers (list): List of user's answers corresponding to questions.
+        times (list, optional): Time taken for each question (in seconds).
+
+    Returns:
+        score (int): Total score.
+        flags (list): List of correctness flags: True if correct, False if incorrect.
+    """
+    score_per_question = 15
+    score = 0
     flags = []
 
-    for i, q in enumerate(questions):
-        ans = answers[i] if i < len(answers) else ""
+    for idx, q in enumerate(questions):
+        correct_ans = q.get("answer")
+        user_ans = answers[idx] if idx < len(answers) else None
 
-        correct_ans = q.get("answer", "")
+        if user_ans == correct_ans:
+            score += score_per_question
+            flags.append(True)
+        else:
+            flags.append(False)
 
-        correct = str(ans).strip().lower() == str(correct_ans).strip().lower()
+        # Optional: implement time-based penalties if needed
+        # if times:
+        #     if times[idx] > 15:  # example: 15 sec limit
+        #         score -= 5  # penalty
 
-        if correct:
-            base = 10
-            t = times[i] if i < len(times) and times[i] else 999
-            bonus = max(0, int((max(0, 15 - min(t, 15)) / 15) * 5))
-            total += base + bonus
-            flags.append("Yes")
-        else:
-            flags.append("No")
+    return score, flags
 
-    return total, flags
 
 
 # ----------------- UI -----------------
@@ -904,52 +916,50 @@ def create_game(host=None, topics=[], num_questions=5, auto_close=True, ai_topic
 
     st.success(f"Game created: {gid} with {len(questions)} questions.")
     return gid
-
-
     
-
 # -------------------------
 # PLAY PAGE
 # -------------------------
 def play_page():
     gid = st.session_state.get("active_game_id")
     uname = st.session_state.get("username")
-
     if not gid or not uname:
         st.error("No active game or username found. Please join or create a game first.")
         return
 
+    # Fetch game and questions
     games = unified_get("games") or {}
     game = games.get(gid)
     if not game:
-        st.error("Game not found!")
+        st.error("Game not found.")
+        return
+    if game.get("closed"):
+        st.warning("This game has already ended.")
         return
 
-    questions = st.session_state.get("game_questions") or game.get("questions", [])
+    questions = game.get("questions", [])
     if not questions:
-        st.error("No questions loaded.")
+        st.info("No questions loaded.")
         return
 
-    # ---------------- FIX 3 : SAFE SESSION INIT ----------------
-    if 'current_index' not in st.session_state or st.session_state['current_index'] is None:
-        st.session_state['current_index'] = 0
-
-    if 'answers' not in st.session_state or len(st.session_state['answers']) != len(questions):
-        st.session_state['answers'] = [""] * len(questions)
-
-    if 'answer_times' not in st.session_state or len(st.session_state['answer_times']) != len(questions):
-        st.session_state['answer_times'] = [None] * len(questions)
+    # Initialize session state
+    if "current_index" not in st.session_state:
+        st.session_state["current_index"] = 0
+    if "answers" not in st.session_state:
+        st.session_state["answers"] = [None] * len(questions)
+    if "answer_times" not in st.session_state:
+        st.session_state["answer_times"] = [0] * len(questions)
+    if "question_started_at" not in st.session_state:
+        st.session_state["question_started_at"] = time.time()
 
-    if 'question_started_at' not in st.session_state or st.session_state['question_started_at'] is None:
-        st.session_state['question_started_at'] = time.time()
-
-    idx = st.session_state['current_index']
+    idx = st.session_state["current_index"]
 
+    # ---------------- End of questions ----------------
     if idx >= len(questions):
         st.success("All done — submit your answers!")
         return
 
-    # ---------------- QUESTION UI ----------------
+    # ---------------- Question UI ----------------
     q = questions[idx]
     st.subheader(f"Question {idx+1}/{len(questions)}")
     st.write(q["question"])
@@ -958,49 +968,42 @@ def play_page():
     time_limit = 15
     st.markdown(f"**Time left:** {max(0, time_limit - elapsed)} seconds")
 
-    # ---------------- FIX 4 : STABLE RADIO ----------------
+    # ---------------- Stable Radio ----------------
     choice = st.radio(
         "Choose an answer:",
         q["options"],
+        index=st.session_state['answers'][idx] if st.session_state['answers'][idx] in q["options"] else 0,
         key=f"choice_{gid}_{idx}"
     )
 
     col1, col2 = st.columns(2)
 
-    # ---------------- NEXT ----------------
+    # ---------------- Next Button ----------------
     with col1:
         if st.button("Next", key=f"next_{gid}_{idx}"):
-            taken = time.time() - st.session_state['question_started_at']
-
-            answers = st.session_state['answers']
-            times = st.session_state['answer_times']
-
-            answers[idx] = choice
-            times[idx] = taken
-
+            # Record answer and time
+            st.session_state['answers'][idx] = choice
+            st.session_state['answer_times'][idx] = time.time() - st.session_state['question_started_at']
+            # Move to next question
             st.session_state['current_index'] = idx + 1
             st.session_state['question_started_at'] = time.time()
             st.rerun()
 
-    # ---------------- SUBMIT ----------------
-    # ---------------- SUBMIT ----------------
+    # ---------------- Submit Button ----------------
     with col2:
         if idx == len(questions) - 1:
             if st.button("Submit All Answers", key=f"submit_{gid}_{idx}"):
+                # Record last question
+                st.session_state['answers'][idx] = choice
+                st.session_state['answer_times'][idx] = time.time() - st.session_state['question_started_at']
+
                 answers = st.session_state['answers']
                 times = st.session_state['answer_times']
-                
-                answers[idx] = choice
-                times[idx] = time.time() - st.session_state['question_started_at']
 
                 # Compute score
-                score, flags = compute_score(
-                    questions,
-                    answers,
-                    times
-                )
+                score, flags = compute_score(questions, answers, times)
                 percentage = int(score / (len(questions) * 15) * 100)
-                
+
                 # Update players dict
                 players = unified_get("players") or {}
                 players.setdefault(gid, {})
@@ -1013,7 +1016,8 @@ def play_page():
                     "timestamp": now_iso()
                 }
                 unified_set("players", players)
-                # Push to leaderboard CSV / Firebase
+
+                # Push to leaderboard
                 row = {
                     "name": uname,
                     "avatar": st.session_state.get("avatar", "🎮"),
@@ -1026,22 +1030,25 @@ def play_page():
                     "answers": answers,
                     "correct_flags": flags
                 }
-                unified_push_leaderboard(row)  # <--- THIS IS KEY
-                
+                unified_push_leaderboard(row)
+
                 # Auto-close game if needed
                 if game.get('auto_close', True):
                     games[gid]['closed'] = True
                     games[gid]['closed_at'] = now_iso()
                     unified_set("games", games)
 
-                st.success(
-                    f"Submitted! Score: {score} / {len(questions) * 15} ({percentage}%)"
-                )
+                # Reset session state
+                st.success(f"Submitted! Score: {score} / {len(questions)*15} ({percentage}%)")
                 st.balloons()
                 st.session_state['last_score'] = score
                 st.session_state['last_game'] = gid
                 st.session_state['current_index'] = 0
+                st.session_state['answers'] = []
+                st.session_state['answer_times'] = []
                 st.rerun()
+
+
         
 # Join game
 def join_game_page():