elkay frontend xp

dashboards/student_db.py

@@ -39,8 +39,8 @@ def show_student_dashboard():
     level = int(stats.get("level", 1))
     study_streak = int(stats.get("streak", 0))
 
-    # Cap for the visual bar
-    max_xp = max(500, ((xp // 500) + 1) * 500)
+    # # Cap for the visual bar
+    # max_xp = max(500, ((xp // 500) + 1) * 500)
 
     # Assignments for “My Work”
     if USE_LOCAL_DB and hasattr(dbapi, "list_assignments_for_student"):
@@ -156,20 +156,55 @@ def show_student_dashboard():
             st.markdown("---")
 
     # --- XP Bar ---
-    pct = 0 if max_xp <= 0 else min(100, int(round((xp / max_xp) * 100)))
+    # 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">{xp} / {max_xp} XP</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>
         """,
         unsafe_allow_html=True
     )
-    st.write("")
+    # pct = 0 if max_xp <= 0 else min(100, int(round((xp / max_xp) * 100)))
+    # st.markdown(
+    #     f"""
+    #     <div class="xp-card">
+    #         <span class="xp-level">Level {level}</span>
+    #         <span class="xp-text">{xp} / {max_xp} XP</span>
+    #         <div class="xp-bar">
+    #             <div class="xp-fill" style="width: {pct}%;"></div>
+    #         </div>
+    #     </div>
+    #     """,
+    #     unsafe_allow_html=True
+    # )
+    # st.write("")
 
 
     # --- Recent Lessons & Achievements ---

utils/db.py

@@ -1,5 +1,4 @@
 # utils/db.py (top of file)
-# utils/db.py (top of file)
 import os
 import json
 import certifi
@@ -1015,17 +1014,30 @@ def _count_lessons(teacher_id:int):
 
 
 # --- XP and streak helpers ---
-def user_xp_and_level(user_id:int):
+def user_xp_and_level(user_id: int, base: int = 500):
     with cursor() as cur:
         cur.execute("SELECT COALESCE(SUM(delta),0) AS xp FROM xp_log WHERE user_id=%s", (user_id,))
-        xp = (cur.fetchone() or {"xp": 0})["xp"]
-        # simple leveling curve: every 500 XP is a level
-        level = max(1, (xp // 500) + 1)
-        # streak
-        cur.execute("SELECT days FROM streaks WHERE user_id=%s", (user_id,))
-        row = cur.fetchone()
-        streak = int(row["days"]) if row and row.get("days") is not None else 0
-    return dict(xp=int(xp), level=int(level), streak=streak)
+        xp = int((cur.fetchone() or {"xp": 0})["xp"])
+        cur.execute("SELECT COALESCE(days,0) AS days FROM streaks WHERE user_id=%s", (user_id,))
+        streak = int((cur.fetchone() or {"days": 0})["days"])
+
+    # level math
+    level = max(1, xp // base + 1)
+    start_of_level = (level - 1) * base
+    into = xp - start_of_level
+    need = base
+    # exact boundary should flip level and reset progress
+    if into == need:
+        level += 1
+        into = 0
+
+    return {
+        "xp": xp,          # lifetime XP from the DB
+        "level": level,    # current level
+        "into": into,      # XP inside this level
+        "need": need,      # XP needed to reach next level
+        "streak": streak,
+    }
 
 def recent_lessons_for_student(user_id:int, limit:int=5):
     with cursor() as cur: