elkay frontend game leaderboard

phase/Student_view/game.py

@@ -124,19 +124,13 @@ def render_leaderboard(leaderboard):
     st.markdown(html, unsafe_allow_html=True)
 
 def _load_leaderboard(user_id: int, limit: int = 10) -> list[dict]:
-    """
-    Returns rows shaped for render_leaderboard():
-      [{"rank": int|"You", "name": str, "level": int, "xp": int, "user_id": int}, ...]
-    - If DISABLE_DB=1, fetch from backend via utils.api.
-    - If local DB is enabled, use utils.db.
-    """
     you_name = (st.session_state.get("user") or {}).get("name") or "You"
     class_id = st.session_state.get("current_class_id")
     rows: list[dict] = []
 
     try:
         if USE_LOCAL_DB:
-            # Local DB path
+            # ---------- local DB path ----------
             if not class_id and hasattr(dbapi, "list_classes_for_student"):
                 classes = dbapi.list_classes_for_student(user_id) or []
                 if classes:
@@ -148,19 +142,17 @@ def _load_leaderboard(user_id: int, limit: int = 10) -> list[dict]:
             elif hasattr(dbapi, "leaderboard_global"):
                 rows = dbapi.leaderboard_global(limit=limit) or []
             elif class_id and hasattr(dbapi, "class_student_metrics"):
-                # Build from metrics if no leaderboard helper
                 metrics = dbapi.class_student_metrics(class_id) or []
-                rows = [
-                    {
-                        "user_id": m.get("student_id"),
-                        "name": m.get("name") or m.get("email") or "Student",
-                        "xp": int(m.get("total_xp", 0)),
-                        "level": dbapi.level_from_xp(int(m.get("total_xp", 0))),
-                    }
-                    for m in metrics
-                ]
+                rows = [{
+                    "user_id": m.get("student_id"),
+                    "name": m.get("name") or m.get("email") or "Student",
+                    "xp": int(m.get("total_xp", 0)),
+                    "level": dbapi.level_from_xp(int(m.get("total_xp", 0))),
+                } for m in metrics]
+
         else:
-            # Backend API path
+            # ---------- backend API path (DISABLE_DB=1) ----------
+            # 1) pick a class for the logged-in student
             if not class_id:
                 try:
                     classes = api.list_classes_for_student(user_id) or []
@@ -171,56 +163,44 @@ def _load_leaderboard(user_id: int, limit: int = 10) -> list[dict]:
                     st.session_state.current_class_id = class_id
 
             if class_id:
-                # Use per-class metrics from backend and derive leaderboard
+                # 2) get roster
                 try:
-                    metrics = api.class_student_metrics(class_id) or []
+                    roster = api.list_students_in_class(class_id) or []
                 except Exception:
-                    metrics = []
-                rows = [
-                    {
-                        "user_id": m.get("student_id"),
-                        "name": m.get("name") or m.get("email") or "Student",
-                        "xp": int(m.get("total_xp", 0)),
-                        # if backend does not send level, compute from XP
-                        "level": (int(m.get("level")) if "level" in m
-                                  else 1 + int(m.get("total_xp", 0)) // 500),
-                    }
-                    for m in metrics
-                ]
+                    roster = []
+
+                # 3) for each student, pull stats (XP/level)
+                rows = []
+                for s in roster:
+                    sid = s.get("user_id") or s.get("student_id")
+                    if not sid:
+                        continue
+                    try:
+                        stt = api.user_stats(int(sid)) or {}
+                    except Exception:
+                        stt = {}
+                    rows.append({
+                        "user_id": int(sid),
+                        "name": s.get("name") or s.get("email") or "Student",
+                        "xp": int(stt.get("xp", 0)),
+                        "level": int(stt.get("level", 1)),
+                    })
             else:
-                # No class. At least show the current user by calling /students/{id}/stats
+                # No class available; at least show the current user
                 try:
-                    stats = api.user_stats(user_id) or {}
+                    s = api.user_stats(user_id) or {}
                 except Exception:
-                    stats = {}
-                rows = [{
-                    "user_id": user_id,
-                    "name": you_name,
-                    "xp": int(stats.get("xp", 0)),
-                    "level": int(stats.get("level", 1)),
-                }]
+                    s = {}
+                rows = [{"user_id": user_id, "name": you_name,
+                         "xp": int(s.get("xp", 0)), "level": int(s.get("level", 1))}]
     except Exception:
-        # Silent fallback, do not spam a yellow warning box
         rows = []
 
-    # Ensure current user is present
+    # Ensure YOU is present
     if not any(r.get("user_id") == user_id for r in rows):
-        # pull stats from whichever path is available
-        if USE_LOCAL_DB:
-            try:
-                s = dbapi.user_xp_and_level(user_id) or {}
-                you_xp = int(s.get("xp", 0)); you_lvl = int(s.get("level", 1))
-            except Exception:
-                you_xp, you_lvl = 0, 1
-        else:
-            try:
-                s = api.user_stats(user_id) or {}
-                you_xp = int(s.get("xp", 0)); you_lvl = int(s.get("level", 1))
-            except Exception:
-                you_xp, you_lvl = 0, 1
-        rows.append({"user_id": user_id, "name": you_name, "xp": you_xp, "level": you_lvl})
+        rows.append({"user_id": user_id, "name": you_name, "xp": 0, "level": 1})
 
-    # Sort by XP desc and rank
+    # Rank, mark YOU, put YOU first
     rows.sort(key=lambda r: int(r.get("xp", 0)), reverse=True)
     ranked = []
     for i, r in enumerate(rows, start=1):
@@ -231,20 +211,17 @@ def _load_leaderboard(user_id: int, limit: int = 10) -> list[dict]:
             "level": int(r["level"]),
             "xp": int(r["xp"]),
         })
-
-    # Mark "You"
     for r in ranked:
         if r["user_id"] == user_id:
             r["rank"] = "You"
             break
-
-    # Put "You" at the top visually
     you = [r for r in ranked if r["rank"] == "You"]
     others = [r for r in ranked if r["rank"] != "You"]
     return (you + others)[:limit]
 
 
 
+
 # --- MAIN GAMES HUB & ROUTER ---
 def show_games():
     load_css(os.path.join("assets", "styles.css"))