pengyuthon/shcool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

本地合并master，修复代码冲突

Browse Source
This commit is contained in:
liuhaoran 2026-06-20 20:03:48 +08:00
commit 4803679f10
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
learning_center/models/course_homework.py
View File

@ -35,8 +35,12 @@ class CourseHomework(models.Model):
teaching_class_id = fields.Many2one('course.teaching_class', string='教学班', teaching_class_id = fields.Many2one('course.teaching_class', string='教学班',
ondelete='cascade', domain="[('course_id', '=', course_id)]") ondelete='cascade', domain="[('course_id', '=', course_id)]")
submit_ids = fields.One2many('course.homework.submit', 'homework_id', string='提交记录') submit_ids = fields.One2many('course.homework.submit', 'homework_id', string='提交记录')
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
score_item_ids = fields.One2many('course.score.item', 'homework_id', string='成绩项目') score_item_ids = fields.One2many('course.score.item', 'homework_id', string='成绩项目')
=======
score_item_ids = fields.One2many('course.score.item', 'homework_id', string='成绩项')
>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
======= =======
score_item_ids = fields.One2many('course.score.item', 'homework_id', string='成绩项') score_item_ids = fields.One2many('course.score.item', 'homework_id', string='成绩项')
>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb >>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
@ -86,6 +90,7 @@ class CourseHomework(models.Model):
self.publish_time = fields.Datetime.now() self.publish_time = fields.Datetime.now()
# 1. 批量为本班学生生成空白未提交记录 # 1. 批量为本班学生生成空白未提交记录
self._auto_create_empty_submit() self._auto_create_empty_submit()
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
# 新增：自动生成对应作业的学生成绩明细 # 新增：自动生成对应作业的学生成绩明细
self._auto_create_homework_score_detail() self._auto_create_homework_score_detail()
@ -146,6 +151,11 @@ class CourseHomework(models.Model):
# 2. 推送作业通知给学生 # 2. 推送作业通知给学生
self._send_homework_notice_to_students() self._send_homework_notice_to_students()
=======
# 2. 推送作业通知给学生
self._send_homework_notice_to_students()
>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
def _send_homework_notice_to_students(self): def _send_homework_notice_to_students(self):
"""发布作业后推送消息给教学班学生""" """发布作业后推送消息给教学班学生"""
self.ensure_one() self.ensure_one()
@ -174,6 +184,9 @@ class CourseHomework(models.Model):
partner_ids=student_users.mapped('partner_id').ids, partner_ids=student_users.mapped('partner_id').ids,
subtype_xmlid='mail.mt_comment' subtype_xmlid='mail.mt_comment'
) )
<<<<<<< HEAD
>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
=======
>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb >>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
def _auto_create_empty_submit(self): def _auto_create_empty_submit(self):
@ -202,15 +215,19 @@ class CourseHomework(models.Model):
batch_vals.append({ batch_vals.append({
'homework_id': self.id, 'homework_id': self.id,
'student_id': stu_id, 'student_id': stu_id,
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
'course_score_item_id':self.course_score_item_id.id, 'course_score_item_id':self.course_score_item_id.id,
======= =======
>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
=======
>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb >>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
'state': 'unsubmit' # 默认未提交 'state': 'unsubmit' # 默认未提交
}) })
# 批量创建空白提交记录 # 批量创建空白提交记录
submit_model.create(batch_vals) submit_model.create(batch_vals)
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
def _send_homework_notice_to_students(self): def _send_homework_notice_to_students(self):
"""发布作业后推送消息给教学班学生""" """发布作业后推送消息给教学班学生"""
@ -241,6 +258,8 @@ class CourseHomework(models.Model):
subtype_xmlid='mail.mt_note' subtype_xmlid='mail.mt_note'
) )
=======
>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
======= =======
>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb >>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
# ====================== 草稿/关闭作业 ====================== # ====================== 草稿/关闭作业 ======================
@ -369,6 +388,7 @@ class CourseHomework(models.Model):
def create(self, vals): def create(self, vals):
homework_record = super().create(vals) homework_record = super().create(vals)
# 草稿状态不执行自动生成提交记录，移到action_publish # 草稿状态不执行自动生成提交记录，移到action_publish
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
target_a = self.env["course.score.item"].search([ target_a = self.env["course.score.item"].search([
@ -382,5 +402,7 @@ class CourseHomework(models.Model):
"homework_ids": [(4, homework_record.id)] "homework_ids": [(4, homework_record.id)]
}) })
======= =======
>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
=======
>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb >>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
return homework_record return homework_record

3
learning_center/models/course_homework_submit.py
View File

@ -94,7 +94,10 @@ class CourseHomeworkSubmit(models.Model):
submit_rec = super().create(vals) submit_rec = super().create(vals)
self._check_submit_change_state(submit_rec) self._check_submit_change_state(submit_rec)
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
======= =======
>>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb >>>>>>> 0b2a587b69524dafde97f76bad27721afebdcddb
return submit_rec return submit_rec