Update app.py

app.py

@@ -173,6 +173,10 @@ def get_student_courses():
     grade = request.args.get("grade", None)
     admin_class = request.args.get("admin_class", None)
 
+    # 参数验证：如果没有提供admin_class参数，返回空结果
+    if not admin_class:
+        return jsonify([])
+    
     # 筛选数据
     filtered_data = grade_data
     
@@ -180,11 +184,15 @@ def get_student_courses():
     # if grade:
     #     filtered_data = filtered_data[filtered_data["grade"] == grade]
         
-    if admin_class:
-        filtered_data = filtered_data[filtered_data["行政班级"].str.contains(admin_class, na=False)]
+    # 筛选指定班级的数据
+    filtered_data = filtered_data[filtered_data["行政班级"].str.contains(admin_class, na=False)]
+    
+    # 如果没有找到匹配的班级，返回空结果
+    if filtered_data.empty:
+        return jsonify([])
 
-    # 筛选课程类型：只要必修课
-    filtered_data = filtered_data[filtered_data["课程类别"].str.contains("必修课", na=False)]
+    # 移除课程类型筛选，显示所有课程（必修课、选修课等）
+    # filtered_data = filtered_data[filtered_data["课程类别"].str.contains("必修课", na=False)]
 
     if week:
         week = int(week)
@@ -201,8 +209,9 @@ def get_student_courses():
             course_date = calculate_date(week, day)  # 计算课程日期
             
             # 根据地点判断校区
-            location = row["地点"].split("（")[0] if "（" in row["地点"] else row["地点"]
-            campus = get_campus_by_classroom(str(row["地点"]))
+            location_str = str(row["地点"]) if pd.notna(row["地点"]) else ""
+            location = location_str.split("（")[0] if "（" in location_str else location_str
+            campus = get_campus_by_classroom(location_str)
             # 简化校区名称显示
             campus_display = campus.replace("校区", "")
             
@@ -239,10 +248,18 @@ def get_courses_by_teacher():
     week = request.args.get("week", 1)
     teacher = request.args.get("teacher", None)
 
+    # 参数验证：如果没有提供teacher参数，返回空结果
+    if not teacher:
+        return jsonify([])
+    
     # 筛选数据
     filtered_data = teacher_data
-    if teacher:
-        filtered_data = filtered_data[filtered_data["教师"] == teacher]
+    # 筛选指定教师的数据
+    filtered_data = filtered_data[filtered_data["教师"] == teacher]
+    
+    # 如果没有找到匹配的教师，返回空结果
+    if filtered_data.empty:
+        return jsonify([])
     if week:
         week = int(week)
         filtered_data = filtered_data[filtered_data["周次"].apply(lambda x: week in parse_weeks(x) if pd.notna(x) else False)]
@@ -256,8 +273,9 @@ def get_courses_by_teacher():
             course_date = calculate_date(week, day)  # 计算课程日期
             
             # 根据地点判断校区
-            location = row["地点"].split("（")[0] if "（" in row["地点"] else row["地点"]
-            campus = get_campus_by_classroom(str(row["地点"]))
+            location_str = str(row["地点"]) if pd.notna(row["地点"]) else ""
+            location = location_str.split("（")[0] if "（" in location_str else location_str
+            campus = get_campus_by_classroom(location_str)
             # 简化校区名称显示
             campus_display = campus.replace("校区", "")
             
@@ -330,7 +348,9 @@ def get_courses_by_classroom():
     classroom = request.args.get("classroom", None)
     campus = request.args.get("campus", None)
     
-
+    # 参数验证：如果没有提供classroom参数，返回空结果
+    if not classroom:
+        return jsonify([])
     
     if classroom_data.empty:
         return jsonify({"error": "教室数据未加载"}), 500
@@ -340,8 +360,13 @@ def get_courses_by_classroom():
     
     if campus:
         filtered_data = filtered_data[filtered_data["校区"] == campus]
-    if classroom:
-        filtered_data = filtered_data[filtered_data["教室"] == classroom]
+    
+    # 筛选指定教室的数据
+    filtered_data = filtered_data[filtered_data["教室"] == classroom]
+    
+    # 如果没有找到匹配的教室，返回空结果
+    if filtered_data.empty:
+        return jsonify([])
     
     if week:
         week = int(week)
@@ -505,9 +530,9 @@ def get_student_courses_v2():
     else:
         return jsonify([])
 
-    # 按课程类型筛选
-    if '课程类别' in filtered_data.columns:
-        filtered_data = filtered_data[filtered_data["课程类别"].str.contains("必修课", na=False)]
+    # 移除课程类型筛选，显示所有课程（必修课、选修课等）
+    # if '课程类别' in filtered_data.columns:
+    #     filtered_data = filtered_data[filtered_data["课程类别"].str.contains("必修课", na=False)]
 
     # 按周次筛选
     if week:
@@ -530,8 +555,9 @@ def get_student_courses_v2():
             course_date = calculate_date(week, day)  # 计算课程日期
             
             # 根据地点判断校区
-            location = row["地点"].split("（")[0] if "（" in row["地点"] else row["地点"]
-            campus = get_campus_by_classroom(str(row["地点"]))
+            location_str = str(row["地点"]) if pd.notna(row["地点"]) else ""
+            location = location_str.split("（")[0] if "（" in location_str else location_str
+            campus = get_campus_by_classroom(location_str)
             # 简化校区名称显示
             campus_display = campus.replace("校区", "")