diff --git a/college/models/chapter.py b/college/models/chapter.py index d33a3ef..59a94d3 100644 --- a/college/models/chapter.py +++ b/college/models/chapter.py @@ -81,6 +81,9 @@ class CourseChapter(models.Model): attachment_ids = fields.One2many( 'yuthon.school.course.chapter.attachment', 'chapter_id', string='附件') + # 随堂笔记:老师按章节记录的富文本笔记(与章节编辑表单共用同一字段) + notes = fields.Html(string='随堂笔记', sanitize=True) + @api.depends('video_file', 'video_filename') def _compute_video_filename_display(self): """显示用:从 ir.attachment 读取视频真实文件名并持久化。""" @@ -130,7 +133,7 @@ class CourseChapter(models.Model): """学生端:弹窗打开当前章节的学习页(带视频播放/附件下载)。""" self.ensure_one() study_form = self.env.ref( - 'school.yuthon_school_course_chapter_study_form') + 'college.yuthon_school_course_chapter_study_form') return { 'type': 'ir.actions.act_window', 'name': '学习章节', @@ -145,7 +148,7 @@ class CourseChapter(models.Model): """老师端:弹窗打开当前章节的编辑页。""" self.ensure_one() edit_form = self.env.ref( - 'school.yuthon_school_course_chapter_form_view') + 'college.yuthon_school_course_chapter_form_view') return { 'type': 'ir.actions.act_window', 'name': '编辑章节', diff --git a/college/static/src/img/Course Management.png b/college/static/src/img/Course Management.png new file mode 100644 index 0000000..85d8050 Binary files /dev/null and b/college/static/src/img/Course Management.png differ diff --git a/college/static/src/img/take courses.png b/college/static/src/img/take courses.png new file mode 100644 index 0000000..a39eead Binary files /dev/null and b/college/static/src/img/take courses.png differ diff --git a/college/views/chapter_views.xml b/college/views/chapter_views.xml index a6c172a..f97563e 100644 --- a/college/views/chapter_views.xml +++ b/college/views/chapter_views.xml @@ -14,6 +14,7 @@ + @@ -119,4 +120,71 @@ (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_school_course_study_form')})]"/> current + + + + yuthon.school.course.chapter.notes.list + yuthon.school.course.chapter + 40 + + + + + + + + + + + + + yuthon.school.course.chapter.notes.form + yuthon.school.course.chapter + 40 + + +
+ +

+
+ 所属课程: +
+ + + + +
+
+
+
+ + + + yuthon.school.course.chapter.notes.search + yuthon.school.course.chapter + 40 + + + + + + + + + + + + + 随堂笔记 + yuthon.school.course.chapter + list,form + ['|', ('course_id.teacher_id', '=', uid), ('course_id.student_ids.user_id', '=', uid)] + {'search_default_group_by_course': 1} + + + current + + diff --git a/college/views/menus.xml b/college/views/menus.xml index e255ed8..1f11c85 100644 --- a/college/views/menus.xml +++ b/college/views/menus.xml @@ -1,15 +1,15 @@ + web_icon="college,static/src/img/Course Management.png" + sequence="20"/> @@ -100,4 +100,41 @@ action="action_yuthon_school_assignment_submission" sequence="30" groups="college.group_teacher,base.group_system"/> + + + + + + 系统说明 + /web + self + + + 操作说明 + /web + self + + + + + + + + diff --git a/yuthon_login_theme/static/src/img/login_bg.jpg b/yuthon_login_theme/static/src/img/login_bg.jpg index 7417d45..a577537 100644 Binary files a/yuthon_login_theme/static/src/img/login_bg.jpg and b/yuthon_login_theme/static/src/img/login_bg.jpg differ