elkay: lesson.py and teacher link

phase/Student_view/lesson.py

@@ -1,13 +1,16 @@
 import streamlit as st
 from typing import List, Dict, Any, Optional, Tuple
 import re
-import datetime  # NEW
+import datetime
+import os
+from utils import db as dbapi
 
 # Internal API client (already used across the app)
 # Uses BACKEND_URL/BACKEND_TOKEN env vars and has retry logic
 # See utils/api.py for details
 from utils import api as backend_api
 
+USE_LOCAL_DB = os.getenv("DISABLE_DB", "1") != "1"
 
 FALLBACK_TAG = "<!--fallback-->"
 
@@ -33,6 +36,19 @@ def _ensure_state():
         if k not in st.session_state:
             st.session_state[k] = v
 
+def _fetch_assigned_lesson(lesson_id: int) -> dict:
+    """
+    Returns {"lesson": {...}, "sections": [...]}
+    Falls back to backend_api if you're not using the local DB.
+    """
+    if USE_LOCAL_DB and hasattr(dbapi, "get_lesson"):
+        return dbapi.get_lesson(lesson_id) or {}
+
+    # If your backend exposes GET /lessons/{id}
+    try:
+        return backend_api.get_lesson(lesson_id) or {}
+    except Exception:
+        return {}
 
 # ---------------------------------------------
 # Content metadata (UI only)
@@ -616,9 +632,86 @@ def _render_results():
 # ---------------------------------------------
 # Public entry point(s)
 # ---------------------------------------------
+def _render_assigned_lesson(lesson_id: int, assignment_id: Optional[int] = None):
+    data = _fetch_assigned_lesson(lesson_id)
+    if not data or not data.get("lesson"):
+        st.error("Lesson not found or not available.")
+        if st.button("⬅ Back to Classes"):
+            # Clear the route and bounce back to the Teacher Link page
+            st.session_state.lesson_route = None
+            st.session_state.current_page = "Teacher Link"
+            st.rerun()
+        return
+
+    L = data["lesson"]
+    sections = sorted(data.get("sections", []), key=lambda s: int(s.get("position", 0)))
+
+    st.markdown(f"### {L.get('title', 'Untitled')}")
+    if L.get("description"):
+        st.caption(L["description"])
+
+    # Track which section we’re on
+    key = f"_dbsec_idx_{lesson_id}"
+    if key not in st.session_state:
+        st.session_state[key] = 0
+
+    idx = st.session_state[key]
+    total = max(1, len(sections))
+    st.progress((idx + 1) / total, text=f"Unit {idx + 1} of {total}")
+
+    if not sections:
+        st.info("No sections have been added to this lesson yet.")
+        if st.button("⬅ Back to Classes"):
+            st.session_state.lesson_route = None
+            st.session_state.current_page = "Teacher Link"
+            st.rerun()
+        return
+
+    sec = sections[idx]
+    sec_title = sec.get("title") or f"Section {idx + 1}"
+    content = (sec.get("content") or sec.get("body") or "").strip()
+
+    st.subheader(sec_title)
+    if content:
+        st.markdown(content, unsafe_allow_html=True)
+    else:
+        st.info("Content coming soon.")
+
+    col1, col2, col3 = st.columns([1, 1, 1])
+    with col1:
+        if st.button("← Previous", disabled=idx == 0):
+            st.session_state[key] = max(0, idx - 1)
+            st.rerun()
+    with col2:
+        if st.button("Back to Classes"):
+            st.session_state.lesson_route = None
+            st.session_state.current_page = "Teacher Link"
+            st.rerun()
+    with col3:
+        is_last = idx >= len(sections) - 1
+
+        # If your DB has a quiz section type, you can detect and branch here.
+        # For now we just advance or finish.
+        if is_last:
+            if st.button("Finish"):
+                st.success("Lesson complete.")
+                st.session_state.lesson_route = None
+                st.session_state.current_page = "Teacher Link"
+                st.rerun()
+        else:
+            if st.button("Next →"):
+                st.session_state[key] = idx + 1
+                st.rerun()
+
 
 def render():
     _ensure_state()
+    # If we were routed here from the Teacher Link, skip the catalog flow.
+    route = st.session_state.get("lesson_route")
+    if route and route.get("source") == "teacher":
+        _render_assigned_lesson(int(route.get("lesson_id", 0)), route.get("assignment_id"))
+        return
+
 
     # Breadcrumb
     st.caption("Learning Path · " + st.session_state.level.capitalize())

phase/Student_view/teacherlink.py

@@ -204,8 +204,16 @@ def show_code():
                     with c1:
                         # pass lesson & assignment to the Lessons page
                         if st.button("▶️ Start Lesson", key=f"start_lesson_{r.get('assignment_id')}"):
-                            st.session_state.selected_lesson = r.get("lesson_id")
-                            st.session_state.selected_assignment = r.get("assignment_id")
+                            st.session_state.selected_lesson = int(r.get("lesson_id"))          # keep for backward compat
+                            st.session_state.selected_assignment = int(r.get("assignment_id"))  # keep for backward compat
+
+                            # New explicit route hint. This is what fixes your navigation.
+                            st.session_state.lesson_route = {
+                                "source": "teacher",
+                                "lesson_id": int(r.get("lesson_id")),
+                                "assignment_id": int(r.get("assignment_id") or 0),
+                            }
+
                             st.session_state.current_page = "Lessons"
                             st.rerun()
                     with c2: