elkay frontend game xp

dashboards/student_db.py

@@ -14,6 +14,17 @@ 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")
@@ -139,36 +150,29 @@ def show_student_dashboard():
     st.write("")
 
         # --- XP Bar ---
-    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)))
+    # --- 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)
 
     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: {xp:,}</div>
+            <div class="xp-bar"><div class="xp-fill" style="width:{pct}%;"></div></div>
+            <div class="xp-total">Total XP: {total_xp:,}</div>
         </div>
         """,
         unsafe_allow_html=True

phase/Student_view/game.py

@@ -16,6 +16,16 @@ 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():
@@ -259,45 +269,36 @@ def show_games():
         # pull live XP/level
         user_id = st.session_state.user["user_id"]
 
-        # 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}
+        # 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}
 
         total_xp = int(stats.get("xp", 0))
-        level    = int(stats.get("level", 1))
-        st.session_state.xp     = total_xp
+        level_api = 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")
 
-        # 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")
+        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")
         st.markdown(f"""
             <div style="background:#e0e0e0;border-radius:12px;padding:3px;width:100%;">
                 <div style="
-                    width:{progress_pct}%;
+                    width:{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;">
@@ -309,7 +310,6 @@ def show_games():
 
 
 
-
     st.markdown("---")
 
         # Game list