ignore pyc

.gitignore

@@ -1,2 +1,3 @@
 xx.js
-local_config.json
+local_config.json
+*.pyc

app.py

@@ -3815,7 +3815,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
             with gr.Accordion("💡 提醒", open=True):
                 gr.Markdown("Cutor 是你得力的作文批改小幫手，但它不是老師，和你一樣都在學習，偶爾也會出錯。如果你對於 Cutor 給你的建議有疑問，請提出和平台討論喔")
             with gr.Row():
-                assignment_interface = create_assignment_ui(user_data, _AssignmentService, _SubmissionService, _DashboardService)
+                assignment_interface = create_assignment_ui(user_data, user_email, user_nickname, _AssignmentService, _SubmissionService, _DashboardService)
 
     demo.load(
         init_params, 

assignment_service.py

@@ -38,7 +38,7 @@ class AssignmentService:
         
         return metadata
 
-    def create_assignment(self, user_data, assignment_type, metadata):
+    def create_assignment(self, user_data, user_email, user_nickname,assignment_type, metadata):
         assignment_id = self.create_assignment_id()
         timestamp_now = datetime.now(pytz.utc).astimezone(pytz.timezone('Asia/Taipei')).strftime("%Y-%m-%d %H:%M:%S")
         host_url = "https://www.junyiacademy.org/event/jutor_write_2024/?__theme=light"
@@ -52,6 +52,8 @@ class AssignmentService:
         new_assignment = {
             "assignment_id": assignment_id,
             "assigner_data": user_data,
+            "assigner_email": user_email,
+            "assigner_nickname": user_nickname,
             "assignment_type": assignment_type,
             "metadata": metadata,
             "assignment_url": assignment_url,

assignment_ui.py

@@ -2,7 +2,7 @@ import gradio as gr
 from datetime import datetime
 import pandas as pd
 
-def create_assignment_ui(user_data, assignment_service, submission_service, dashboard_service):
+def create_assignment_ui(user_data, user_email, user_nickname, assignment_service, submission_service, dashboard_service):
     with gr.Blocks() as assignment_interface:
         with gr.Tab("老師|建立作業"):
             with gr.Row():
@@ -65,7 +65,7 @@ def create_assignment_ui(user_data, assignment_service, submission_service, dash
                         outputs=[assignment_metadata]
                     ).then(
                         assignment_service.create_assignment,
-                        inputs=[user_data, assignment_type, assignment_metadata],
+                        inputs=[user_data, user_email, user_nickname, assignment_type, assignment_metadata],
                         outputs=[assignment_data]
                     ).then(
                         update_gr_assignment_url,
@@ -565,13 +565,13 @@ def create_assignment_ui(user_data, assignment_service, submission_service, dash
                 download_submissions_button = gr.Button("下載提交作業 CSV")
                 submissions_df_file = gr.File()
 
-            def update_dashboard(user_data):
+            def update_dashboard(user_data, user_email, user_nickname):
                 # 獲取作業列表
                 assignments = dashboard_service.get_dashboard_data(user_data)
                 assignments_df = pd.DataFrame(assignments)
 
                 # 獲取所有提交的作業
-                submissions = dashboard_service.get_all_submissions(user_data)
+                submissions = dashboard_service.get_all_submissions(user_data, user_email, user_nickname)
                 submissions_df = pd.DataFrame(submissions)
 
                 return assignments_df, submissions_df
@@ -586,7 +586,7 @@ def create_assignment_ui(user_data, assignment_service, submission_service, dash
 
             refresh_dashboard_button.click(
                 fn=update_dashboard,
-                inputs=[user_data],
+                inputs=[user_data, user_email, user_nickname],
                 outputs=[assignments_df, submissions_df]
             )
 

dashboard_service.py

@@ -62,12 +62,25 @@ class DashboardService:
             "assignment_data": assignment_data
         }
 
-    def get_all_submissions(self, user_id):
+    def get_all_submissions(self, user_id, user_email, user_nickname):
         assignments = self.assignment_service.get_user_assignments(user_id)
         all_submissions = []
 
         for assignment_id, assignment_info in assignments.items():
+            # 20251016 新增
+            # 確認 assignment_data 是否包含 "assigner_email" and "assigner_nickname" 欄位
+            # 如果沒有，且 user_id 是 admin，則給 value = 空值
+            # 如果不是 admin 則給 value from user_email, user_nickname
             assignment_data = self.assignment_service.get_assignment(assignment_id)
+            if "assigner_email" not in assignment_data["metadata"] or "assigner_nickname" not in assignment_data["metadata"]:
+                if user_id == "admin":
+                    assignment_data["metadata"]["assigner_email"] = f"""查無email - {assignment_data["metadata"]["assigner_data"]["email"]}"""
+                    assignment_data["metadata"]["assigner_nickname"] = f"""查無名稱 - {assignment_data["metadata"]["assigner_data"]["nickname"]}"""
+                else:
+                    assignment_data["metadata"]["assigner_email"] = user_email
+                    assignment_data["metadata"]["assigner_nickname"] = user_nickname
+                    self.assignment_service.update_assignment(assignment_id, assignment_data)
+
             submission_ids = assignment_data.get("submission_ids", [])
 
             for submission_id in submission_ids:
@@ -80,6 +93,8 @@ class DashboardService:
                         # "學生_id": submission_data["student_id"],
                         "學生Email": submission_data.get("student_email", "未提供"),
                         "學生姓名": submission_data["student_name"],
+                        "老師Email": assignment_data["metadata"]["assigner_email"],
+                        "老師姓名": assignment_data["metadata"]["assigner_nickname"],
                         "繳交日期": submission_data["timestamp"],
                         "分數": score
                     })