elkay frontend quiz.py

phase/Student_view/quiz.py

@@ -1,35 +1,60 @@
+import os
 import streamlit as st
 from utils.quizdata import quizzes_data
 import datetime
 import json
 from utils import db as dbapi
+import utils.api as api
 
+USE_LOCAL_DB = os.getenv("DISABLE_DB", "1") != "1"
 
+def _get_quiz_from_source(quiz_id: int):
+    """
+    Fetch a quiz payload from the local DB (if enabled) or from the backend API.
+    Expected backend shape: {'quiz': {...}, 'items': [...]}
+    """
+    if USE_LOCAL_DB and hasattr(dbapi, "get_quiz"):
+        return dbapi.get_quiz(quiz_id)
+    # backend: expose GET /quizzes/{quiz_id}
+    return api.get_quiz(quiz_id)
 
+def _submit_quiz_result(student_id: int, assignment_id: int, quiz_id: int,
+                        score: int, total: int, details: dict):
+    """
+    Submit a quiz result either to the local DB or to the backend API.
+    """
+    if USE_LOCAL_DB and hasattr(dbapi, "submit_quiz"):
+        return dbapi.submit_quiz(student_id=student_id,
+                                 assignment_id=assignment_id,
+                                 quiz_id=quiz_id,
+                                 score=score, total=total, details=details)
+    # backend: POST /quizzes/submit (or your route of choice)
+    # utils.api should wrap that route; below assumes api.submit_quiz exists.
+    return api.submit_quiz(student_id=student_id,
+                           assignment_id=assignment_id,
+                           quiz_id=quiz_id,
+                           score=score, total=total, details=details)
 
 def _load_quiz_obj(quiz_id):
     """
     Return a normalized quiz object from either quizzes_data (built-in)
-    or the DB (utils.db.get_quiz). Always shape as:
+    or the backend/DB. Normalized shape:
       {"title": str, "questions": [{"question","options","answer","points"}...]}
-    For DB rows, convert answer_key letters (e.g., "A") into the option text.
     """
-    # Prefer the built-in quizzes when present (IDs 1..5)
+    # Built-ins first
     if quiz_id in quizzes_data:
         q = quizzes_data[quiz_id]
-        # ensure each question has points
         for qq in q.get("questions", []):
             qq.setdefault("points", 1)
         return q
 
-    # Fallback: DB quiz
-    data = dbapi.get_quiz(quiz_id)  # {'quiz': {...}, 'items': [...]}
+    # Teacher-assigned (DB/backend)
+    data = _get_quiz_from_source(int(quiz_id))  # <-- uses API when DISABLE_DB=1
     if not data:
         return {"title": f"Quiz {quiz_id}", "questions": []}
 
     items_out = []
     for it in (data.get("items") or []):
-        # decode JSON if needed
         opts = it.get("options")
         if isinstance(opts, (str, bytes)):
             try:
@@ -41,15 +66,13 @@ def _load_quiz_obj(quiz_id):
         ans = it.get("answer_key")
         if isinstance(ans, (str, bytes)):
             try:
-                ans = json.loads(ans)
+                ans = json.loads(ans)  # support '["A","C"]'
             except Exception:
-                # allow a single letter like "A"
-                pass
+                pass  # allow "A"
 
-        # convert letter(s) -> option text
         def letter_to_text(letter):
             if isinstance(letter, str):
-                idx = ord(letter.upper()) - 65  # A->0, B->1...
+                idx = ord(letter.upper()) - 65
                 return opts[idx] if 0 <= idx < len(opts) else letter
             return letter
 
@@ -297,7 +320,7 @@ def show_results(quiz_id):
     if isinstance(quiz_id, int):
         assignment_id = st.session_state.get("current_assignment")
         if assignment_id:
-            dbapi.submit_quiz(
+            _submit_quiz_result(
                 student_id=st.session_state.user["user_id"],
                 assignment_id=assignment_id,
                 quiz_id=quiz_id,