Update app.py

app.py

@@ -2,55 +2,77 @@ import streamlit as st
 import requests
 import pandas as pd
 
-# ==========================
+# ===============================
 # Firebase config từ secrets.toml
-# ==========================
+# ===============================
 FIREBASE_URL = st.secrets["firebase_database_url"]
 FIREBASE_AUTH = st.secrets["firebase_api_key"]
 
-# ==========================
-# Session state
-# ==========================
-if "creator_logged_in" not in st.session_state:
-    st.session_state.creator_logged_in = False
 
-st.title("SmartEdu System")
+# ===============================
+# Helper functions
+# ===============================
+def firebase_get(path):
+    url = f"{FIREBASE_URL}/{path}.json?auth={FIREBASE_AUTH}"
+    try:
+        res = requests.get(url)
+        return res.json() if res.status_code == 200 else None
+    except:
+        return None
 
-# ==========================
-# Role Selection
-# ==========================
-role = st.selectbox("Chọn vai trò", ["Quiz Creator", "Student Evaluation"])
 
-# ==========================
+def firebase_put(path, data):
+    url = f"{FIREBASE_URL}/{path}.json?auth={FIREBASE_AUTH}"
+    try:
+        res = requests.put(url, json=data)
+        return res.json() if res.status_code == 200 else None
+    except:
+        return None
+
+
+# ===============================
+# SIDEBAR MENU
+# ===============================
+st.sidebar.title("SmartEdu System")
+menu = st.sidebar.selectbox("Select Mode", ["Quiz Creator", "Student Evaluation"])
+
+
+# ===============================
 # QUIZ CREATOR
-# ==========================
-if role == "Quiz Creator":
-    st.subheader("Đăng nhập Quiz Creator")
-
-    if not st.session_state.creator_logged_in:
-        username = st.text_input("Tài khoản")
-        password = st.text_input("Mật khẩu", type="password")
-
-        if st.button("Đăng nhập"):
-            if username == "master" and password == "master":
-                st.session_state.creator_logged_in = True
-                st.success("Đăng nhập thành công!")
-                st.stop()
+# ===============================
+if menu == "Quiz Creator":
+
+    st.header("Quiz Creator Login")
+
+    # Session Login
+    if "creator_login" not in st.session_state:
+        st.session_state.creator_login = False
+
+    if not st.session_state.creator_login:
+        usr = st.text_input("Username")
+        pwd = st.text_input("Password", type="password")
+
+        if st.button("Login"):
+            if usr == "master" and pwd == "master":
+                st.session_state.creator_login = True
+                st.success("Login successful!")
+                st.rerun()
             else:
-                st.error("Sai tài khoản hoặc mật khẩu")
+                st.error("Wrong username or password")
+
         st.stop()
 
-    st.success("Bạn đang đăng nhập với quyền Quiz Creator")
-    st.subheader("Tạo Quiz mới")
+    # After login
+    st.success("You are logged in as Quiz Creator")
+    st.subheader("Create New Quiz")
 
-    quiz_name = st.text_input("Tên Quiz (ví dụ: Quiz1)")
+    quiz_name = st.text_input("Quiz Name (Example: Quiz1)")
 
-    # ==========================
-    # 10 CÂU HỎI — ĐÁP ÁN ĐÚNG THEO TEXT
-    # ==========================
     questions = []
+
     for i in range(1, 11):
-        st.markdown(f"### Câu hỏi {i}")
+        st.markdown(f"### Question {i}")
+
         q_text = st.text_input(f"Nội dung câu hỏi {i}", key=f"q{i}")
 
         options = []
@@ -58,9 +80,9 @@ if role == "Quiz Creator":
             opt = st.text_input(f"Đáp án {j}", key=f"q{i}_opt{j}")
             options.append(opt)
 
-        # Chọn đáp án đúng bằng TEXT
+        # Correct answer chosen by TEXT
         correct = st.selectbox(
-            f"Đáp án đúng của câu {i} (theo nội dung text)",
+            f"Đáp án đúng của câu {i} (chọn theo text)",
             options,
             key=f"q{i}_correct"
         )
@@ -71,91 +93,87 @@ if role == "Quiz Creator":
             "correct": correct
         })
 
-    # Lưu quiz
-    if st.button("Lưu Quiz"):
+    if st.button("Save Quiz"):
         valid = all(q["question"] and all(q["options"]) for q in questions)
 
         if not quiz_name:
-            st.error("Nhập tên quiz")
+            st.error("Quiz name required!")
+
         elif not valid:
-            st.error("Nhập đầy đủ câu hỏi và đáp án")
+            st.error("Fill all questions and answers!")
+
         else:
-            url = f"{FIREBASE_URL}/master_quizzes/{quiz_name}.json?auth={FIREBASE_AUTH}"
-            requests.put(url, json={"questions": questions})
-            st.success(f"Đã lưu quiz '{quiz_name}' với 10 câu hỏi!")
+            firebase_put(f"master_quizzes/{quiz_name}", {"questions": questions})
+            st.success(f"Quiz '{quiz_name}' saved successfully!")
+
+
+# ===============================
+# STUDENT EVALUATION
+# ===============================
+elif menu == "Student Evaluation":
 
-# ================================
-# STUDENT EVALUATION (UPDATED)
-# ================================
-elif choice == "Student Evaluation":
-    st.header("Student Evaluation & Feedback")
+    st.header("Student Evaluation")
 
-    # Nút Refresh
+    # -------- Refresh Button --------
     if st.button("🔄 Refresh Data"):
         st.cache_data.clear()
         st.rerun()
 
-    # Lấy danh sách toàn bộ student
-    students = fetch_data(FIREBASE_URL + "/Students.json")
+    # Load students
+    students = firebase_get("student_quizzes")
+
     if not students:
-        st.warning("No student data found!")
+        st.warning("No student data found.")
         st.stop()
 
+    # List of student IDs
     student_ids = list(students.keys())
-    selected_id = st.selectbox("Select Student ID", student_ids)
 
-    student_info = students[selected_id]
+    selected_id = st.selectbox("Select Student ID", student_ids)
+    info = students[selected_id]
 
     st.subheader("Student Information")
-    st.write(f"**Name:** {student_info.get('Name','')}")
-    st.write(f"**Class:** {student_info.get('Class','')}")
+    st.write(f"**Name:** {info.get('Name', '')}")
+    st.write(f"**Class:** {info.get('Class', '')}")
 
-    # Lấy danh sách Quiz của student (Quiz1, Quiz2, ...)
-    quiz_keys = [k for k in student_info.keys() if k.startswith("Quiz")]
+    # Find quiz keys
+    quiz_keys = [k for k in info.keys() if k.startswith("Quiz")]
 
-    if not quiz_keys:
-        st.info("Student has no quiz data yet.")
-        st.stop()
-
-    # Chuẩn bị bảng hiển thị
-    table_rows = []
+    # ---- Table Overview ----
+    table_data = []
     for q in quiz_keys:
-        qdata = student_info[q]
+        qd = info[q]
 
-        score   = qdata.get("Score", "")
-        time    = qdata.get("Time", "")
-        fb_text = qdata.get("Feedback", "")
-        fb_flag = "Yes" if fb_text else "No"
+        score = qd.get("Score", "")
+        time = qd.get("Time", "")
+        fb = qd.get("Feedback", "")
+        fb_status = "Yes" if fb else "No"
 
-        table_rows.append({
+        table_data.append({
             "Quiz": q,
             "Score": score,
             "Time": time,
-            "Feedbacked": fb_flag
+            "Feedbacked": fb_status
         })
 
-    st.subheader("Quiz Overview")
-    st.table(table_rows)
+    st.subheader("Quiz Overview Table")
+    df = pd.DataFrame(table_data)
+    st.dataframe(df, use_container_width=True)
 
-    # -------- Feedback Section --------
-    st.subheader("Give Feedback")
+    # ----- FEEDBACK SECTION -----
+    st.subheader("Feedback")
 
-    selected_quiz = st.selectbox("Select quiz for feedback", quiz_keys)
+    choose_quiz = st.selectbox("Select quiz to feedback", quiz_keys)
+    selected_quiz_data = info[choose_quiz]
 
-    # Nếu quiz đã có Feedback -> hiển thị
-    existing_fb = student_info[selected_quiz].get("Feedback", "")
+    # Show existing feedback
+    existing_fb = selected_quiz_data.get("Feedback", "")
     if existing_fb:
-        st.info(f"Existing feedback for **{selected_quiz}**:\n\n{existing_fb}")
-
-    feedback_text = st.text_area("Enter new feedback")
+        st.info(f"📌 Existing feedback:\n\n{existing_fb}")
 
-    if st.button("Submit Feedback"):
-        update_path = f"/Students/{selected_id}/{selected_quiz}/Feedback.json"
-        result = update_data(FIREBASE_URL + update_path, feedback_text)
-
-        if result is not None:
-            st.success(f"Feedback saved for {selected_quiz}!")
-            st.rerun()
-        else:
-            st.error("Failed to save feedback.")
+    feedback = st.text_area("Enter new feedback")
 
+    if st.button("Send Feedback"):
+        firebase_put(f"student_quizzes/{selected_id}/{choose_quiz}/Feedback", feedback)
+        st.success("Feedback sent successfully!")
+        st.rerun()