diff --git a/app/models/student_work.rb b/app/models/student_work.rb index d7d24c9ed..9293b1d78 100644 --- a/app/models/student_work.rb +++ b/app/models/student_work.rb @@ -228,6 +228,11 @@ class StudentWork < ApplicationRecord shixun_work_comments.size > 0 || student_works_scores.size > 0 || challenge_work_scores.size > 0 end + # 普通/分组作品是否已被评阅过 + def work_has_comment? + student_works_scores.select{|score| score.reviewer_role < 3}.size > 0 + end + def scored? student_works_scores.where.not(reviewer_role: 3, score: nil).exists? end diff --git a/app/views/homework_commons/works_list.json.jbuilder b/app/views/homework_commons/works_list.json.jbuilder index e545253c0..e05fc9e07 100644 --- a/app/views/homework_commons/works_list.json.jbuilder +++ b/app/views/homework_commons/works_list.json.jbuilder @@ -175,7 +175,7 @@ elsif @homework.homework_type == "group" || @homework.homework_type == "normal" json.user_login @is_evaluation ? "--" : work.user.try(:login) json.user_name @is_evaluation ? "匿名" : work.user.try(:real_name) json.user_img @is_evaluation ? "--" : url_to_avatar(work.user) - + json.has_comment work.work_has_comment? end end