Merge pull request '完善教育' (#54) from qtb into master

Reviewed-on: #54

college/models/assignment.py

@@ -20,6 +20,13 @@ class SchoolAssignment(models.Model):
         ondelete='cascade',
         domain="[('state', '=', 'published'), ('teacher_id', '=', uid)]",
         help='只能选择自己已发布的课程。')
+    chapter_id = fields.Many2one(
+        'yuthon.school.course.chapter',
+        string='对应章节',
+        domain="[('course_id', '=', course_id)]",
+        ondelete='set null',
+        index=True,
+        help='该作业所属的课程章节，不选则代表整门课程作业。')
     teacher_id = fields.Many2one(
         'res.users', string='布置教师',
         default=lambda self: self.env.user, required=True)
@@ -111,6 +118,15 @@ class SchoolAssignmentSubmission(models.Model):
     _order = 'submit_time desc, id'
     _rec_name = 'name'
 
+    chapter_id = fields.Many2one(
+        'yuthon.school.course.chapter',
+        string='章节',
+        related='assignment_id.chapter_id',
+        store=True, index=True,
+    )
+
+
+
     name = fields.Char(string='提交标题', readonly=True, copy=False)
     assignment_id = fields.Many2one(
         'yuthon.school.assignment', string='作业', required=True, ondelete='cascade')

college/models/course.py

@@ -106,6 +106,20 @@ class SchoolCourse(models.Model):
     chapter_count = fields.Integer(
         string='章节数', compute='_compute_chapter_count', store=True)
 
+    # 课程作业：一门课对应多条作业记录
+    assignment_ids = fields.One2many(
+        'yuthon.school.assignment',
+        'course_id',
+        string='作业布置',
+    )
+
+    # 学习进展：一门课对应多条学员进度记录
+    progress_ids = fields.One2many(
+        'yuthon.school.progress',
+        'course_id',
+        string='学习进展',
+    )
+
     @api.depends('student_ids')
     def _compute_student_count(self):
         for record in self:

college/views/course_views.xml

@@ -33,8 +33,8 @@
                             invisible="[('state', '!=', 'published')]"/>
                     <button name="action_to_draft" type="object" string="转为草稿"
                             invisible="[('state', '=', 'draft')]"/>
-                    <field name="state" widget="statusbar"
-                           statusbar_visible="draft,published,archived"/>
+<!--                    <field name="state" widget="statusbar"-->
+<!--                           statusbar_visible="draft,published,archived"/>-->
                 </header>
                 <sheet>
                     <group>
@@ -104,6 +104,23 @@
                         <page string="业务情景">
                             <field name="business_scenario"/>
                         </page>
+
+                        <page string="学习进度" groups="college.group_teacher,base.group_system">
+                            <field name="progress_ids" mode="kanban,list" readonly="1"
+                                   context="{'kanban_view_ref': 'college.yuthon_school_progress_view_kanban', 'tree_view_ref': 'college.yuthon_school_progress_view_list'}"/>
+                        </page>
+                        <page string="作业布置" groups="college.group_teacher,base.group_system">
+                            <field name="assignment_ids">
+                                <list>
+                                    <field name="name" string="作业标题"/>
+                                    <field name="chapter_id" string="对应章节"/>
+                                    <field name="due_date" string="截止日期"/>
+                                    <field name="submission_count" string="提交数"/>
+                                    <field name="state" string="状态"/>
+                                </list>
+                            </field>
+                        </page>
+
                     </notebook>
                 </sheet>
                 <chatter/>

college/views/homework_views.xml

@@ -44,9 +44,13 @@
                             <field name="name" placeholder="请输入作业标题"/>
                         </h1>
                     </div>
+
                     <group>
                         <group>
                             <field name="course_id"/>
+                            <field name="chapter_id"
+                                   domain="[('course_id', '=', course_id)]"
+                                   context="{'default_course_id': course_id}"/>
                             <field name="teacher_id" readonly="1"/>
                             <field name="due_date"/>
                         </group>
@@ -55,6 +59,7 @@
                             <field name="attachment_filename" invisible="1"/>
                         </group>
                     </group>
+
                     <notebook>
                         <page string="作业说明">
                             <field name="description"/>
@@ -119,7 +124,7 @@
         <field name="name">yuthon.school.assignment.submission.list</field>
         <field name="model">yuthon.school.assignment.submission</field>
         <field name="arch" type="xml">
-            <list string="作业提交" multi_edit="1">
+            <list string="作业提交" multi_edit="1" create="0">
                 <header>
                     <button name="action_open_batch_wizard"
                             type="object" string="批量批改"
@@ -146,7 +151,8 @@
         <field name="arch" type="xml">
             <kanban default_group_by="state"
                     default_order="due_date desc, id"
-                    class="college-course-kanban college-kanban-homework o_kanban_mobile">
+                    class="college-course-kanban college-kanban-homework o_kanban_mobile"
+                    create="0">
                 <field name="assignment_id"/>
                 <field name="student_id"/>
                 <field name="score"/>