elkay frontend game xp

dashboards/student_db.py

@@ -14,17 +14,6 @@ def load_css(file_name: str):
     except FileNotFoundError:
         st.warning("⚠️ Stylesheet not found. Please ensure 'assets/styles.css' exists.")
 
-def _level_progress(total_xp: int, base: int = 500):
-    xp = int(max(0, total_xp))
-    level = max(1, xp // base + 1)
-    into = xp - (level - 1) * base
-    need = base
-    if into == need:  # exact boundary
-        level += 1
-        into = 0
-    pct = int(round(100 * into / need)) if need else 0
-    return level, into, need, pct
-
 def show_student_dashboard():
     # Load CSS
     css_path = os.path.join("assets", "styles.css")
@@ -150,29 +139,37 @@ def show_student_dashboard():
     st.write("")
 
         # --- XP Bar ---
-    # --- XP Bar (live, per-level) ---
-    total_xp = int(stats.get("xp", 0))
-    level_api = int(stats.get("level", 1))
-
-    # prefer server fields if present
-    into = stats.get("into")
-    need = stats.get("need")
-
-    if isinstance(into, (int, float)) and isinstance(need, (int, float)) and need > 0:
-        level = level_api
-        into  = int(into)
-        need  = int(need)
-        pct   = min(100, int(round(100 * into / need)))
-    else:
-        level, into, need, pct = _level_progress(total_xp)
+    # stats already fetched above
+    xp = int(stats.get("xp", 0))
+    level = int(stats.get("level", 1))
+    study_streak = int(stats.get("streak", 0))
+
+    # prefer server-provided per-level fields
+    into = int(stats.get("into", -1))
+    need = int(stats.get("need", -1))
+
+    # fallback if backend hasn't been updated to include into/need yet
+    if into < 0 or need <= 0:
+        base = 500
+        level = max(1, xp // base + 1)
+        start = (level - 1) * base
+        into = xp - start
+        need = base
+        if into == need:
+            level += 1
+            into = 0
+
+    pct = 0 if need <= 0 else min(100, int(round((into / need) * 100)))
 
     st.markdown(
         f"""
         <div class="xp-card">
             <span class="xp-level">Level {level}</span>
             <span class="xp-text">{into:,} / {need:,} XP</span>
-            <div class="xp-bar"><div class="xp-fill" style="width:{pct}%;"></div></div>
-            <div class="xp-total">Total XP: {total_xp:,}</div>
+            <div class="xp-bar">
+                <div class="xp-fill" style="width: {pct}%;"></div>
+            </div>
+            <div class="xp-total">Total XP: {xp:,}</div>
         </div>
         """,
         unsafe_allow_html=True

phase/Student_view/game.py

@@ -16,16 +16,6 @@ def load_css(file_name: str):
 
 st.session_state.setdefault("current_game", None)
 
-def _level_progress(total_xp: int, base: int = 500):
-    xp = int(max(0, total_xp))
-    level = max(1, xp // base + 1)
-    into = xp - (level - 1) * base
-    need = base
-    if into == need:
-        level += 1
-        into = 0
-    pct = int(round(100 * into / need)) if need else 0
-    return level, into, need, pct
 
 # --- GAME RENDERERS ---
 def _render_budget_builder():
@@ -144,40 +134,36 @@ def _load_leaderboard(user_id: int, limit: int = 10) -> list[dict]:
     class_id = st.session_state.get("current_class_id")
 
     # try to pick a class automatically if none set (optional)
-    if not class_id:
+    if not class_id and hasattr(dbapi, "list_classes_for_student"):
         try:
-            # Prefer backend if DB disabled
-            if USE_LOCAL_DB and hasattr(dbapi, "list_classes_for_student"):
-                classes = dbapi.list_classes_for_student(user_id) or []
-            else:
-                classes = api.list_classes_for_student(user_id) or []
+            classes = dbapi.list_classes_for_student(user_id) or []
             if classes:
                 class_id = classes[0]["class_id"]
                 st.session_state.current_class_id = class_id
         except Exception:
             pass
 
-    # Fetch rows
-    rows = []
+    # fetch rows from DB
     try:
-        if USE_LOCAL_DB and hasattr(dbapi, "leaderboard_for_class") and class_id:
+        if class_id and hasattr(dbapi, "leaderboard_for_class"):
             rows = dbapi.leaderboard_for_class(class_id, limit=limit) or []
-        elif USE_LOCAL_DB and hasattr(dbapi, "leaderboard_global"):
+        elif hasattr(dbapi, "leaderboard_global"):
             rows = dbapi.leaderboard_global(limit=limit) or []
         else:
-            # Backend path: we do not have dedicated leaderboard endpoints,
-            # so build from class_student_metrics which includes total_xp.
-            if class_id:
-                metrics = api.class_student_metrics(class_id) or []
-                for m in metrics:
+            # fallback using existing function if needed
+            rows = []
+            if class_id and hasattr(dbapi, "class_student_metrics"):
+                for m in dbapi.class_student_metrics(class_id) or []:
+                    xp = int(m.get("total_xp", 0))
                     rows.append({
                         "user_id": m.get("student_id"),
                         "name": m.get("name") or m.get("email") or "Student",
-                        "xp": int(m.get("total_xp", 0)),
-                        "level": int(dbapi.level_from_xp(m.get("total_xp", 0))) if USE_LOCAL_DB else int((int(m.get("total_xp", 0)) // 500) + 1),
+                        "xp": xp,
+                        "level": dbapi.level_from_xp(xp),
                     })
     except Exception as e:
         st.warning(f"Leaderboard error: {e}")
+        rows = []
 
     # ensure current user present
     if not any(r.get("user_id") == user_id for r in rows):
@@ -269,36 +255,45 @@ def show_games():
         # pull live XP/level
         user_id = st.session_state.user["user_id"]
 
-        # DB if enabled, else backend
-        try:
-            if USE_LOCAL_DB and hasattr(dbapi, "user_xp_and_level"):
-                stats = dbapi.user_xp_and_level(user_id)
-            else:
-                stats = api.user_stats(user_id)  # /students/{id}/stats
-        except Exception:
-            stats = {"xp": int(st.session_state.get("xp", 0)), "level": 1, "streak": 0}
+        # Prefer local DB only if enabled. Otherwise call backend.
+        if USE_LOCAL_DB and hasattr(dbapi, "user_xp_and_level"):
+            stats = dbapi.user_xp_and_level(user_id)   # {'xp', 'level', 'streak', maybe 'into','need'}
+        else:
+            try:
+                stats = api.user_stats(user_id)        # backend /students/{id}/stats
+            except Exception as e:
+                # hard fallback so the page still renders
+                stats = {"xp": int(st.session_state.get("xp", 0)), "level": 1, "streak": 0}
 
         total_xp = int(stats.get("xp", 0))
-        level_api = int(stats.get("level", 1))
-        st.session_state.xp = total_xp
+        level    = int(stats.get("level", 1))
+        st.session_state.xp     = total_xp
         st.session_state.streak = int(stats.get("streak", 0))
 
+        # Use server-provided per-level values when available
         into = stats.get("into")
         need = stats.get("need")
 
-        if isinstance(into, (int, float)) and isinstance(need, (int, float)) and need > 0:
-            level = level_api
-            into  = int(into)
-            need  = int(need)
-            pct   = min(100, int(round(100 * into / need)))
-        else:
-            level, into, need, pct = _level_progress(total_xp)
-
-        st.write(f"Level {level}  Experience Points")
+        # Fallback if backend has not been updated yet
+        if into is None or need in (None, 0):
+            base = 500
+            level = max(1, total_xp // base + 1)
+            start = (level - 1) * base
+            into = total_xp - start
+            need = base
+            if into == need:
+                level += 1
+                into = 0
+
+        into = int(max(0, into))
+        need = int(max(1, need))
+        progress_pct = min(100, int(round((into / need) * 100)))
+
+        st.write(f"Level {level} Experience Points")
         st.markdown(f"""
             <div style="background:#e0e0e0;border-radius:12px;padding:3px;width:100%;">
                 <div style="
-                    width:{pct}%;
+                    width:{progress_pct}%;
                     background:linear-gradient(135deg,#22c55e,#059669);
                     height:24px;border-radius:10px;text-align:right;
                     color:white;font-weight:bold;padding-right:8px;line-height:24px;">
@@ -310,6 +305,7 @@ def show_games():
 
 
 
+
     st.markdown("---")
 
         # Game list