diff --git a/app/helpers/homework_commons_helper.rb b/app/helpers/homework_commons_helper.rb index cc23d05d6..8da142380 100644 --- a/app/helpers/homework_commons_helper.rb +++ b/app/helpers/homework_commons_helper.rb @@ -224,7 +224,8 @@ module HomeworkCommonsHelper # 作品状态 def homework_status homework, member - [{id: 0, name: "未提交", count: homework.unfinished_count(member)}, + [{id: 3, name: "未通关", count: homework.finished_count(member)}, + {id: 4, name: "已通关", count: homework.delay_finished_count(member)}, {id: 1, name: "按时提交", count: homework.finished_count(member)}, {id: 2, name: "延时提交", count: homework.delay_finished_count(member)}] end diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb index abe254b28..e40c706d1 100644 --- a/app/models/homework_common.rb +++ b/app/models/homework_common.rb @@ -240,6 +240,16 @@ class HomeworkCommon < ApplicationRecord self.teacher_works(member).delay_finished.count end + # 未通关数 + def un_complete_count member + self.teacher_works(member).finished.count + end + + # 通关数 + def complete_count member + + end + # 分组作业的最大分组id def max_group_id self.student_works.has_committed.maximum(:group_id).to_i + 1