实训作业列表增加完成做题数

sso
cxt 5 years ago
parent 6ea1b2a936
commit b8d7ec2a77

@ -177,6 +177,17 @@ module HomeworkCommonsHelper
type == 2 ? student_works.size : (type == 1 ? student_works.where("work_status != 0").size : student_works.where(work_status: 0).size) type == 2 ? student_works.size : (type == 1 ? student_works.where("work_status != 0").size : student_works.where(work_status: 0).size)
end end
# 作品数统计
def calculate_work_count homework_common, member
count = {}
student_works = homework_common.teacher_works(member)
count[:commit_count] = student_works.select{|work| work.work_status != 0 }.size
count[:uncommit_count] = student_works.select{|work| work.work_status == 0 }.size
count[:compelete_count] = Myshixun.where(id: student_works.pluck(:myshixun_id).reject(&:blank?), status: 1).size
count[:all_count] = student_works.size
count
end
# 上次查重的时间 # 上次查重的时间
def last_review_time homework_common, course_group def last_review_time homework_common, course_group
review = homework_common.homework_group_reviews.where(:course_group_id => course_group.id).last review = homework_common.homework_group_reviews.where(:course_group_id => course_group.id).last

@ -25,9 +25,11 @@ json.homeworks @homework_commons.each do |homework|
json.upper_category_name homework.course_second_category&.name unless params[:category] json.upper_category_name homework.course_second_category&.name unless params[:category]
unless curr_status[:status].include?("未发布") unless curr_status[:status].include?("未发布")
json.commit_count studentwork_count homework, 1, @member work_count = calculate_work_count homework, @member
json.uncommit_count studentwork_count homework, 0, @member json.commit_count work_count[:commit_count]
json.all_count studentwork_count homework, 2, @member json.uncommit_count work_count[:uncommit_count]
json.all_count work_count[:all_count]
json.compelete_count work_count[:compelete_count]
end end
if homework.homework_type == "practice" if homework.homework_type == "practice"

Loading…
Cancel
Save