Update app.py

app.py

@@ -1,13 +1,12 @@
 """
-ThutoAI - Complete School Assistant with Dark Mode & Profile Pictures
+ThutoAI - Complete School Assistant with Teacher Assignments & Analytics Dashboard
 Meaning: "Thuto" = Learning/Education (Setswana — used for branding only)
 
-✅ Student Accounts + Profile Pictures
-✅ 🌙 Real Dark Mode Toggle (persists per session)
-✅ 🎙️ Voice Input
-✅ 📅 Assignment Tracker
-✅ 👥 Class Groups
-✅ Modern UI with animations
+✅ Teacher Assignment Posting — Assign work to class groups
+✅ 📊 Analytics Dashboard — Track student engagement, assignments, groups
+✅ 🌙 Dark Mode + 🖼️ Profile Pictures
+✅ 🎙️ Voice Input + 📅 Assignment Tracker + 👥 Class Groups
+✅ All deprecation warnings fixed (Gradio 4.0+ compatible)
 ✅ Fully commented
 """
 
@@ -18,8 +17,9 @@ from typing import List, Dict, Optional
 import time
 import json
 import base64
+from collections import Counter
 
-# ==================== STUDENT SERVICE (Enhanced with Profile Pics) ====================
+# ==================== STUDENT SERVICE ====================
 
 class StudentService:
     """Manages student accounts, chat history, files, assignments, groups, and profile pictures."""
@@ -27,15 +27,16 @@ class StudentService:
     def __init__(self):
         self.students = {
             "student1": {"password": "pass123", "name": "John Doe", "avatar": None},
-            "student2": {"password": "pass456", "name": "Jane Smith", "avatar": None}
+            "student2": {"password": "pass456", "name": "Jane Smith", "avatar": None},
+            "student3": {"password": "pass789", "name": "Alex Johnson", "avatar": None}
         }
         self.student_sessions = {
             "student1": {
                 "chat_history": [],
                 "files": [],
                 "assignments": [
-                    {"title": "Math Quiz", "due_date": "2025-04-25", "course": "MATH10A", "status": "pending"},
-                    {"title": "Science Lab Report", "due_date": "2025-04-30", "course": "SCI11B", "status": "pending"}
+                    {"id": 1, "title": "Math Quiz", "due_date": "2025-04-25", "course": "MATH10A", "status": "pending", "assigned_by": "Mr. Smith"},
+                    {"id": 2, "title": "Science Lab Report", "due_date": "2025-04-30", "course": "SCI11B", "status": "pending", "assigned_by": "Dr. Lee"}
                 ],
                 "groups": ["MATH10A", "SCI11B"],
                 "dark_mode": False
@@ -44,14 +45,22 @@ class StudentService:
                 "chat_history": [],
                 "files": [],
                 "assignments": [
-                    {"title": "History Essay", "due_date": "2025-04-22", "course": "HIST9A", "status": "overdue"},
-                    {"title": "English Reading", "due_date": "2025-04-28", "course": "ENG10A", "status": "pending"}
+                    {"id": 3, "title": "History Essay", "due_date": "2025-04-22", "course": "HIST9A", "status": "overdue", "assigned_by": "Ms. Brown"},
+                    {"id": 4, "title": "English Reading", "due_date": "2025-04-28", "course": "ENG10A", "status": "pending", "assigned_by": "Mr. White"}
                 ],
                 "groups": ["HIST9A", "ENG10A"],
                 "dark_mode": True
+            },
+            "student3": {
+                "chat_history": [],
+                "files": [],
+                "assignments": [],
+                "groups": ["MATH10A", "ENG10A"],
+                "dark_mode": False
             }
         }
         self.valid_groups = ["MATH10A", "MATH10B", "SCI11A", "SCI11B", "ENG10A", "ENG10B", "HIST9A", "HIST9B"]
+        self.all_assignments = []  # Master list for analytics
 
     def register_student(self, username: str, password: str, name: str) -> str:
         if not username or not password or not name:
@@ -92,12 +101,8 @@ class StudentService:
 
     def update_avatar(self, username: str, avatar_path: str):
         if username in self.students and avatar_path:
-            # In real app, save file and store path
-            # Here we'll just store filename for demo
             self.students[username]["avatar"] = avatar_path
 
-    # ... (all previous methods: get_chat_history, add_to_chat_history, etc. remain unchanged)
-
     def get_chat_history(self, username: str) -> List:
         return self.student_sessions.get(username, {}).get("chat_history", [])
 
@@ -116,8 +121,23 @@ class StudentService:
             })
 
     def get_assignments(self, username: str) -> List:
-        assignments = self.student_sessions.get(username, {}).get("assignments", [])
-        return sorted(assignments, key=lambda x: x["due_date"])
+        """Get assignments for groups student has joined."""
+        if username not in self.student_sessions:
+            return []
+        student_groups = set(self.student_sessions[username]["groups"])
+        all_assignments = []
+        for user_data in self.student_sessions.values():
+            for assignment in user_data.get("assignments", []):
+                if assignment["course"] in student_groups:
+                    all_assignments.append(assignment)
+        # Remove duplicates by ID
+        seen = set()
+        unique_assignments = []
+        for assignment in all_assignments:
+            if assignment["id"] not in seen:
+                seen.add(assignment["id"])
+                unique_assignments.append(assignment)
+        return sorted(unique_assignments, key=lambda x: x["due_date"])
 
     def get_groups(self, username: str) -> List:
         return self.student_sessions.get(username, {}).get("groups", [])
@@ -138,12 +158,54 @@ class StudentService:
                 return f"✅ Left group: {group_code.upper()}"
         return "❌ Group not found or not joined."
 
-
+    # Analytics methods
+    def get_total_students(self) -> int:
+        return len(self.students)
+
+    def get_active_students(self) -> int:
+        return len([s for s in self.student_sessions.keys() if len(self.student_sessions[s]["assignments"]) > 0])
+
+    def get_total_assignments(self) -> int:
+        total = 0
+        for user_data in self.student_sessions.values():
+            total += len(user_data.get("assignments", []))
+        return total
+
+    def get_completed_assignments(self) -> int:
+        completed = 0
+        for user_data in self.student_sessions.values():
+            for assignment in user_data.get("assignments", []):
+                if assignment["status"] == "completed":
+                    completed += 1
+        return completed
+
+    def get_group_popularity(self) -> Dict:
+        all_groups = []
+        for user_data in self.student_sessions.values():
+            all_groups.extend(user_data.get("groups", []))
+        return dict(Counter(all_groups))
+
+    def get_recent_activity(self) -> List:
+        activity = []
+        for username, data in self.student_sessions.items():
+            if data["assignments"]:
+                latest = max(data["assignments"], key=lambda x: x.get("assigned_date", "2025-01-01"))
+                activity.append({
+                    "student": self.students[username]["name"],
+                    "last_assignment": latest["title"],
+                    "date": latest.get("assigned_date", "Unknown")
+                })
+        return sorted(activity, key=lambda x: x["date"], reverse=True)[:5]
+
+
+# Initialize student service
 student_service = StudentService()
 
 # ==================== SCHOOL SERVICE ====================
 
 class SchoolService:
+    """Handles announcements, AI context, and shared assignments."""
+
     def __init__(self):
         self.announcements = [
             {
@@ -153,7 +215,8 @@ class SchoolService:
                 "course": "Mathematics",
                 "date": "2025-04-15",
                 "priority": "high",
-                "posted_by": "Mr. Smith"
+                "posted_by": "Mr. Smith",
+                "views": 45
             },
             {
                 "id": 2,
@@ -162,7 +225,8 @@ class SchoolService:
                 "course": "Science",
                 "date": "2025-04-12",
                 "priority": "normal",
-                "posted_by": "Dr. Lee"
+                "posted_by": "Dr. Lee",
+                "views": 32
             },
             {
                 "id": 3,
@@ -171,12 +235,14 @@ class SchoolService:
                 "course": "General",
                 "date": "2025-04-10",
                 "priority": "low",
-                "posted_by": "Librarian"
+                "posted_by": "Librarian",
+                "views": 67
             },
         ]
         self.courses = ["All", "Mathematics", "Science", "English", "History", "General"]
         self.total_announcements = len(self.announcements)
         self.total_files = 0
+        self.assignment_id_counter = 5  # Start after existing assignments
 
     def get_announcements(self, course_filter: str = "All") -> List[Dict]:
         if course_filter == "All":
@@ -192,7 +258,8 @@ class SchoolService:
             "course": course,
             "date": datetime.now().strftime("%Y-%m-%d"),
             "priority": priority,
-            "posted_by": posted_by
+            "posted_by": posted_by,
+            "views": 0
         })
         self.total_announcements += 1
 
@@ -207,23 +274,53 @@ class SchoolService:
             "total_announcements": self.total_announcements,
             "total_files": self.total_files,
             "active_courses": len(set(a["course"] for a in self.announcements if a["course"] != "General")),
-            "high_priority": len([a for a in self.announcements if a["priority"] == "high"])
+            "high_priority": len([a for a in self.announcements if a["priority"] == "high"]),
+            "total_views": sum(a["views"] for a in self.announcements)
         }
 
+    def create_assignment(self, title: str, description: str, due_date: str, course: str, assigned_by: str) -> int:
+        """Create assignment for a specific class group."""
+        assignment_id = self.assignment_id_counter
+        self.assignment_id_counter += 1
+        
+        new_assignment = {
+            "id": assignment_id,
+            "title": title,
+            "description": description,
+            "due_date": due_date,
+            "course": course,
+            "assigned_by": assigned_by,
+            "assigned_date": datetime.now().strftime("%Y-%m-%d"),
+            "status": "pending"
+        }
+        
+        # Assign to all students in this group
+        for username, data in student_service.student_sessions.items():
+            if course in data["groups"]:
+                data["assignments"].append(new_assignment.copy())
+        
+        return assignment_id
+
 
 school_service = SchoolService()
 
 # ==================== ADMIN SERVICE ====================
 
 class AdminService:
+    """Handles teacher and admin authentication."""
+
     def __init__(self):
-        self.admins = {
-            "teacher@thutoai.edu": "password123",
-            "admin@school.org": "letmein"
+        self.teachers = {
+            "teacher@thutoai.edu": {"password": "password123", "name": "Mr. Smith", "role": "teacher"},
+            "scienceteacher@school.org": {"password": "science123", "name": "Dr. Lee", "role": "teacher"},
+            "admin@school.org": {"password": "letmein", "name": "Admin", "role": "admin"}
         }
 
-    def authenticate(self, username: str, password: str) -> bool:
-        return self.admins.get(username) == password
+    def authenticate(self, username: str, password: str) -> Optional[Dict]:
+        user = self.teachers.get(username)
+        if user and user["password"] == password:
+            return {"name": user["name"], "role": user["role"]}
+        return None
 
 
 admin_service = AdminService()
@@ -246,6 +343,7 @@ else:
 # ==================== AI CHAT FUNCTION ====================
 
 def ai_chat(message: str, history: List, username: str = "guest") -> tuple:
+    """Generate AI response with loading state and save to history."""
     if not message.strip():
         return history, ""
 
@@ -305,6 +403,7 @@ Guidelines:
 # ==================== UI RENDERING HELPERS ====================
 
 def render_announcements(course: str) -> str:
+    """Render announcements with modern cards."""
     announcements = school_service.get_announcements(course)
     if not announcements:
         return """
@@ -350,6 +449,7 @@ def render_announcements(course: str) -> str:
                         <span>📚 {ann['course']}</span>
                         <span>📅 {ann['date']}</span>
                         <span>👨‍🏫 {ann['posted_by']}</span>
+                        <span>👁️ {ann['views']} views</span>
                     </div>
                 </div>
             </div>
@@ -360,6 +460,7 @@ def render_announcements(course: str) -> str:
 
 
 def render_assignments(assignments: List[Dict]) -> str:
+    """Render assignments in a clean, prioritized list."""
     if not assignments:
         return """
         <div style='text-align: center; padding: 40px; color: #6c757d;'>
@@ -403,8 +504,9 @@ def render_assignments(assignments: List[Dict]) -> str:
             <div style='display: flex; justify-content: space-between; align-items: flex-start;'>
                 <div>
                     <h3 style='margin: 0 0 8px 0; color: #212529;'>{task['title']}</h3>
-                    <div style='color: #6c757d; margin-bottom: 8px;'>📚 {task['course']}</div>
+                    <div style='color: #6c757d; margin-bottom: 8px;'>📚 {task['course']} · 👩‍🏫 {task['assigned_by']}</div>
                     <div style='color: #495057;'>📅 Due: {task['due_date']}</div>
+                    <div style='color: #6c757d; font-size: 0.9em;'>{task.get('description', '')}</div>
                 </div>
                 <span style='
                     background: {color};
@@ -424,6 +526,7 @@ def render_assignments(assignments: List[Dict]) -> str:
 
 
 def render_groups(groups: List[str]) -> str:
+    """Render joined class groups."""
     if not groups:
         return """
         <div style='text-align: center; padding: 40px; color: #6c757d;'>
@@ -468,9 +571,122 @@ def get_avatar_html(avatar_path: Optional[str], name: str) -> str:
     return img_html
 
 
+def render_analytics() -> str:
+    """Render analytics dashboard for admins."""
+    total_students = student_service.get_total_students()
+    active_students = student_service.get_active_students()
+    total_assignments = student_service.get_total_assignments()
+    completed_assignments = student_service.get_completed_assignments()
+    group_popularity = student_service.get_group_popularity()
+    recent_activity = student_service.get_recent_activity()
+    school_stats = school_service.get_stats()
+
+    completion_rate = (completed_assignments / total_assignments * 100) if total_assignments > 0 else 0
+
+    html = f"""
+    <div style='display: grid; grid-template-columns: repeat(2, 1fr); gap: 24px; margin-bottom: 32px;'>
+        <div style='background: white; padding: 20px; border-radius: 12px; box-shadow: 0 2px 8px rgba(0,0,0,0.08);'>
+            <h3 style='color: #212529; margin: 0 0 16px 0;'>👥 Student Engagement</h3>
+            <div style='display: grid; grid-template-columns: 1fr 1fr; gap: 16px;'>
+                <div style='text-align: center; padding: 16px; background: #e3f2fd; border-radius: 8px;'>
+                    <div style='font-size: 2em; color: #1976d2;'>{total_students}</div>
+                    <div>Total Students</div>
+                </div>
+                <div style='text-align: center; padding: 16px; background: #e8f5e8; border-radius: 8px;'>
+                    <div style='font-size: 2em; color: #2e7d32;'>{active_students}</div>
+                    <div>Active Students</div>
+                </div>
+            </div>
+        </div>
+        
+        <div style='background: white; padding: 20px; border-radius: 12px; box-shadow: 0 2px 8px rgba(0,0,0,0.08);'>
+            <h3 style='color: #212529; margin: 0 0 16px 0;'>📊 Assignment Stats</h3>
+            <div style='display: grid; grid-template-columns: 1fr 1fr; gap: 16px;'>
+                <div style='text-align: center; padding: 16px; background: #fff3e0; border-radius: 8px;'>
+                    <div style='font-size: 2em; color: #ef6c00;'>{total_assignments}</div>
+                    <div>Total Assignments</div>
+                </div>
+                <div style='text-align: center; padding: 16px; background: #f3e5f5; border-radius: 8px;'>
+                    <div style='font-size: 2em; color: #7b1fa2;'>{completion_rate:.1f}%</div>
+                    <div>Completion Rate</div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div style='display: grid; grid-template-columns: 1fr 1fr; gap: 24px; margin-bottom: 32px;'>
+        <div style='background: white; padding: 20px; border-radius: 12px; box-shadow: 0 2px 8px rgba(0,0,0,0.08);'>
+            <h3 style='color: #212529; margin: 0 0 16px 0;'>📈 Popular Class Groups</h3>
+            <div style='display: grid; gap: 12px;'>
+    """
+
+    sorted_groups = sorted(group_popularity.items(), key=lambda x: x[1], reverse=True)
+    for group, count in sorted_groups[:5]:
+        percentage = (count / total_students * 100) if total_students > 0 else 0
+        html += f"""
+                <div style='display: flex; align-items: center; gap: 12px;'>
+                    <div style='width: 100%; background: #e0e0e0; height: 8px; border-radius: 4px;'>
+                        <div style='width: {percentage}%; background: #6e8efb; height: 100%; border-radius: 4px;'></div>
+                    </div>
+                    <div style='min-width: 80px;'>{group}</div>
+                    <div style='color: #6c757d;'>{count} students</div>
+                </div>
+        """
+
+    html += """
+            </div>
+        </div>
+
+        <div style='background: white; padding: 20px; border-radius: 12px; box-shadow: 0 2px 8px rgba(0,0,0,0.08);'>
+            <h3 style='color: #212529; margin: 0 0 16px 0;'>📢 Announcement Stats</h3>
+            <div style='display: grid; gap: 12px;'>
+    """
+
+    for ann in school_service.announcements[:5]:
+        views = ann.get("views", 0)
+        max_views = max(a.get("views", 0) for a in school_service.announcements) if school_service.announcements else 1
+        width_percent = (views / max_views * 100) if max_views > 0 else 0
+        html += f"""
+                <div style='display: flex; align-items: center; gap: 12px;'>
+                    <div style='width: 100%; background: #e0e0e0; height: 8px; border-radius: 4px;'>
+                        <div style='width: {width_percent}%; background: #ff7043; height: 100%; border-radius: 4px;'></div>
+                    </div>
+                    <div style='min-width: 120px; font-size: 0.9em;'>{ann['title'][:20]}...</div>
+                    <div style='color: #6c757d;'>{views} views</div>
+                </div>
+        """
+
+    html += """
+            </div>
+        </div>
+    </div>
+
+    <div style='background: white; padding: 20px; border-radius: 12px; box-shadow: 0 2px 8px rgba(0,0,0,0.08);'>
+        <h3 style='color: #212529; margin: 0 0 16px 0;'>⏱️ Recent Activity</h3>
+        <div style='display: grid; gap: 12px;'>
+    """
+
+    for activity in recent_activity:
+        html += f"""
+            <div style='padding: 12px; background: #f8f9fa; border-radius: 8px; display: flex; justify-content: space-between; align-items: center;'>
+                <div>
+                    <strong>{activity['student']}</strong> received assignment: <em>{activity['last_assignment']}</em>
+                </div>
+                <div style='color: #6c757d; font-size: 0.9em;'>{activity['date']}</div>
+            </div>
+        """
+
+    html += """
+        </div>
+    </div>
+    """
+
+    return html
+
 # ==================== STATE MANAGEMENT ====================
 
 CURRENT_USER = "guest"
+CURRENT_TEACHER = None
 DARK_MODE = False
 
 def login_student(username: str, password: str) -> tuple:
@@ -486,7 +702,6 @@ def login_student(username: str, password: str) -> tuple:
         avatar_html = get_avatar_html(student_data["avatar"], student_data["name"])
         welcome_msg = f"Welcome back, {student_data['name']}!"
 
-        # Apply dark mode CSS if needed
         css_class = "dark-mode" if DARK_MODE else ""
 
         return (
@@ -554,8 +769,6 @@ def upload_avatar(file) -> str:
         return "❌ No file selected"
     if CURRENT_USER == "guest":
         return "❌ Please log in first"
-    # In real app, save file to disk and store path
-    # For demo, we'll just store the filename
     student_service.update_avatar(CURRENT_USER, file.name)
     return f"✅ Avatar updated!"
 
@@ -581,6 +794,68 @@ def upload_file_for_student(file) -> str:
         student_service.add_file(CURRENT_USER, file.name)
     return result
 
+# ==================== TEACHER FUNCTIONS ====================
+
+def teacher_login(username: str, password: str) -> tuple:
+    global CURRENT_TEACHER
+    teacher_data = admin_service.authenticate(username, password)
+    if teacher_data and teacher_data["role"] == "teacher":
+        CURRENT_TEACHER = teacher_data
+        return (
+            gr.update(visible=False),
+            gr.update(visible=True),
+            f"✅ Welcome, {teacher_data['name']}!",
+            gr.update(visible=True)
+        )
+    elif teacher_data and teacher_data["role"] == "admin":
+        CURRENT_TEACHER = teacher_data
+        return (
+            gr.update(visible=False),
+            gr.update(visible=True),
+            f"✅ Welcome, Admin {teacher_data['name']}!",
+            gr.update(visible=True)
+        )
+    return (
+        gr.update(visible=True),
+        gr.update(visible=False),
+        "❌ Invalid credentials or not a teacher account",
+        gr.update(visible=False)
+    )
+
+def teacher_logout():
+    global CURRENT_TEACHER
+    CURRENT_TEACHER = None
+    return (
+        gr.update(visible=True),
+        gr.update(visible=False),
+        "",
+        gr.update(visible=False)
+    )
+
+def create_assignment(title: str, description: str, due_date: str, course: str) -> str:
+    if not CURRENT_TEACHER:
+        return "🔒 Please log in as teacher first."
+    if not title or not due_date or not course:
+        return "⚠️ Title, due date, and course are required."
+    if course not in student_service.valid_groups:
+        return "⚠️ Invalid course/group. Choose from available groups."
+
+    assignment_id = school_service.create_assignment(
+        title=title,
+        description=description,
+        due_date=due_date,
+        course=course,
+        assigned_by=CURRENT_TEACHER["name"]
+    )
+
+    # Count how many students received this assignment
+    recipients = 0
+    for data in student_service.student_sessions.values():
+        if course in data["groups"]:
+            recipients += 1
+
+    return f"✅ Assignment created! ID: {assignment_id}. Sent to {recipients} students in {course}."
+
 # ==================== VOICE INPUT ====================
 
 VOICE_JS = """
@@ -612,50 +887,6 @@ async function startVoiceInput() {
 def voice_input_handler() -> str:
     return ""
 
-# ==================== TEACHER FUNCTIONS ====================
-
-IS_ADMIN = False
-
-def admin_login(username: str, password: str) -> tuple:
-    global IS_ADMIN
-    if admin_service.authenticate(username, password):
-        IS_ADMIN = True
-        stats = school_service.get_stats()
-        stats_text = f"📊 Stats: {stats['total_announcements']} announcements, {stats['total_files']} files"
-        return (
-            gr.update(visible=False),
-            gr.update(visible=True),
-            stats_text,
-            gr.update(visible=True)
-        )
-    return (
-        gr.update(visible=True),
-        gr.update(visible=False),
-        "❌ Invalid credentials",
-        gr.update(visible=False)
-    )
-
-def admin_logout():
-    global IS_ADMIN
-    IS_ADMIN = False
-    return (
-        gr.update(visible=True),
-        gr.update(visible=False),
-        "",
-        gr.update(visible=False)
-    )
-
-def post_announcement(title: str, content: str, course: str, priority: str) -> str:
-    if not IS_ADMIN:
-        return "🔒 Please log in first."
-    if not title.strip():
-        return "⚠️ Title is required."
-    if not content.strip():
-        return "⚠️ Content is required."
-
-    school_service.add_announcement(title, content, course, priority)
-    return f"✅ Posted! 🎉 New announcement ID: {len(school_service.announcements)}"
-
 # ==================== CUSTOM CSS ====================
 
 CUSTOM_CSS = """
@@ -707,6 +938,13 @@ CUSTOM_CSS = """
     background: #2a2a2a !important;
     border-color: #5a5a5a !important;
 }
+
+.analytics-card {
+    background: white;
+    padding: 20px;
+    border-radius: 12px;
+    box-shadow: 0 2px 8px rgba(0,0,0,0.08);
+}
 """
 
 # ==================== BUILD UI ====================
@@ -762,8 +1000,7 @@ with gr.Blocks(css=CUSTOM_CSS, theme=gr.themes.Soft(primary_hue="indigo")) as de
                 gr.Markdown("### 💡 Ask me anything — I'm here to help!")
                 chatbot = gr.Chatbot(
                     height=480,
-                    bubble_full_width=False,
-                    elem_classes=["chatbot-container"]
+                    type='messages'  # ✅ FIXED: Replaced deprecated bubble_full_width
                 )
                 with gr.Row():
                     msg = gr.Textbox(
@@ -853,7 +1090,6 @@ with gr.Blocks(css=CUSTOM_CSS, theme=gr.themes.Soft(primary_hue="indigo")) as de
                     inputs=avatar_input,
                     outputs=avatar_status
                 )
-                # Auto-refresh avatar on tab load
                 demo.load(
                     fn=lambda: get_avatar_html(
                         student_service.students[CURRENT_USER]["avatar"] if CURRENT_USER != "guest" else None,
@@ -863,50 +1099,66 @@ with gr.Blocks(css=CUSTOM_CSS, theme=gr.themes.Soft(primary_hue="indigo")) as de
                     outputs=avatar_display
                 )
 
-            with gr.Tab("🔐 Teacher Admin"):
-                gr.Markdown("### 👩‍🏫 Post Announcements & View Stats")
+            with gr.Tab("👩‍🏫 Teacher Panel"):
+                gr.Markdown("### 🔑 Teacher Login (for assignment creation)")
 
                 with gr.Group() as teacher_login_group:
-                    teacher_username = gr.Textbox(label="Username")
+                    teacher_username = gr.Textbox(label="Teacher Username")
                     teacher_password = gr.Textbox(label="Password", type="password")
                     teacher_login_btn = gr.Button("🔓 Login", variant="primary")
                     teacher_status = gr.Textbox(label="Status")
 
                 with gr.Group(visible=False) as teacher_dashboard:
-                    gr.Markdown("### 📊 Dashboard Stats")
-                    stats = school_service.get_stats()
-                    gr.Markdown(f"""
-                    - 📢 Total Announcements: **{stats['total_announcements']}**
-                    - 📁 Total Files Uploaded: **{stats['total_files']}**
-                    - 🎯 Active Courses: **{stats['active_courses']}**
-                    - 🚨 High Priority Posts: **{stats['high_priority']}**
-                    """)
-
-                    gr.Markdown("### ✍️ Create New Announcement")
-                    with gr.Row():
-                        ann_title = gr.Textbox(label="Title", placeholder="e.g., Quiz Moved to Friday", scale=3)
-                        ann_course = gr.Dropdown(choices=school_service.courses[1:], label="Course", value="General", scale=2)
-                    ann_content = gr.Textbox(label="Content", placeholder="Details for students...", lines=3)
-                    ann_priority = gr.Radio(["low", "normal", "high"], label="Priority", value="normal", inline=True)
-                    post_btn = gr.Button("📬 Post Announcement", variant="primary")
-                    post_result = gr.Textbox(label="Result")
+                    gr.Markdown("### ✍️ Create New Assignment")
+                    assignment_title = gr.Textbox(label="Assignment Title", placeholder="e.g., Chapter 5 Quiz")
+                    assignment_description = gr.Textbox(label="Description", placeholder="Instructions for students...", lines=2)
+                    assignment_due_date = gr.Textbox(label="Due Date (YYYY-MM-DD)", placeholder="2025-05-01")
+                    assignment_course = gr.Dropdown(
+                        choices=student_service.valid_groups,
+                        label="Assign to Class Group",
+                        value="MATH10A"
+                    )
+                    create_assignment_btn = gr.Button("📬 Create Assignment", variant="primary")
+                    assignment_result = gr.Textbox(label="Result")
+
+                    # ✅ FIXED: Removed deprecated 'inline' parameter
+                    assignment_priority = gr.Radio(
+                        ["low", "normal", "high"],
+                        label="Priority",
+                        value="normal"
+                    )
 
                     teacher_logout_btn = gr.Button("⬅️ Logout", variant="secondary")
 
                 teacher_login_btn.click(
-                    fn=admin_login,
+                    fn=teacher_login,
                     inputs=[teacher_username, teacher_password],
-                    outputs=[teacher_login_group, teacher_dashboard, teacher_status, post_btn]
+                    outputs=[teacher_login_group, teacher_dashboard, teacher_status, create_assignment_btn]
                 )
                 teacher_logout_btn.click(
-                    fn=admin_logout,
+                    fn=teacher_logout,
                     inputs=None,
-                    outputs=[teacher_login_group, teacher_dashboard, teacher_status, post_result]
+                    outputs=[teacher_login_group, teacher_dashboard, teacher_status, assignment_result]
+                )
+                create_assignment_btn.click(
+                    fn=create_assignment,
+                    inputs=[assignment_title, assignment_description, assignment_due_date, assignment_course],
+                    outputs=assignment_result
                 )
-                post_btn.click(
-                    fn=post_announcement,
-                    inputs=[ann_title, ann_content, ann_course, ann_priority],
-                    outputs=post_result
+
+            with gr.Tab("📊 Admin Analytics"):
+                gr.Markdown("### 📈 School Analytics Dashboard")
+                analytics_display = gr.HTML()
+                refresh_analytics_btn = gr.Button("🔄 Refresh Analytics")
+                refresh_analytics_btn.click(
+                    fn=render_analytics,
+                    inputs=None,
+                    outputs=analytics_display
+                )
+                demo.load(
+                    fn=render_analytics,
+                    inputs=None,
+                    outputs=analytics_display
                 )
 
         # Logout button (already in header)