zaihui
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

申诉中的作品列表不应该显示除自己之外其他学生的姓名和学号，和匿评时保持一致

This commit is contained in:
cxt 2017-06-09 14:38:04 +08:00
parent a34bf6bba7
commit 53c355d0e9
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/student_work_controller.rb
View File

@ -363,7 +363,7 @@ class StudentWorkController < ApplicationController
@homework_commons = @course.homework_commons.where("publish_time <= ?",Time.now).order("created_at desc")
@all_homework_commons = @course.homework_commons.order("created_at desc")
@is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
@is_evaluation = @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status == 3 && !@is_teacher #是不是匿评
@is_evaluation = @homework.homework_detail_manual && (@homework.homework_detail_manual.comment_status == 3 || @homework.homework_detail_manual.comment_status == 4) && !@is_teacher #是不是匿评
@show_all = false
# 0表示没有分组的学生，-1表示所有分组的学生
@ -713,7 +713,7 @@ class StudentWorkController < ApplicationController
@score = student_work_score @work,User.current
@is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
if @homework.homework_detail_manual.comment_status == 3 && !@is_teacher && @work.user != User.current
if (@homework.homework_detail_manual.comment_status == 3 || @homework.homework_detail_manual.comment_status == 4) && !@is_teacher && @work.user != User.current
@student_work_scores = @work.student_works_scores.where("user_id = #{User.current.id} and reviewer_role = 3").order("updated_at desc")
else
@student_work_scores = student_work_score_record(@work)

2
app/views/student_work/_evaluation_work.html.erb
View File

@ -26,7 +26,7 @@
<%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
</td>
<td>
<%= link_to '评阅', student_work_path(student_work), :class => 'link-color-blue' %>
<%= link_to @homework.homework_detail_manual.comment_status == 3 ? '评阅' : '查看', student_work_path(student_work), :class => 'link-color-blue' %>
</td>
<% end%>
</tr>

6
lib/tasks/homework_evaluation.rake
View File

@ -14,7 +14,11 @@ namespace :homework_evaluation do
homework_detail_manuals.each do |homework_detail_manual|
homework_common = homework_detail_manual.homework_common
if homework_common.anonymous_comment == 0 #新建状态才可开启匿评
student_works = homework_common.student_works.has_committed
if homework_common.homework_type == 3
student_works = homework_common.student_works.where(:id => homework_common.student_work_projects.where(:is_leader => 1).map(&:student_work_id))
else
student_works = homework_common.student_works.has_committed
end
if student_works && student_works.size >= 2
if homework_common.homework_type == 3
student_work_projects = homework_common.student_work_projects.where("student_work_id is not null")