jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

作业的小齿轮菜单增加“启用匿评”的选项，同时更新“禁用匿评”的提示信息、禁用匿评的作业截止后也可以编辑“是否启用匿评”

This commit is contained in:
cxt 2016-12-07 17:23:52 +08:00
parent c088af4ea8
commit c24f9b8c3b
7 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/student_work_controller.rb
View File

@ -1060,7 +1060,7 @@ class StudentWorkController < ApplicationController
end end
def forbidden_anonymous_comment def forbidden_anonymous_comment
@homework.update_column('anonymous_comment', 1) @homework.update_column('anonymous_comment', @homework.anonymous_comment == 0 ? 1 : 0)
homework_detail_manual = @homework.homework_detail_manual homework_detail_manual = @homework.homework_detail_manual
homework_detail_programing = @homework.homework_detail_programing homework_detail_programing = @homework.homework_detail_programing
if homework_detail_programing if homework_detail_programing

4
app/helpers/application_helper.rb
View File

@ -3710,7 +3710,9 @@ def get_hw_status homework_common
end end
if Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") if Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
str += '<span class="green_homework_btn_cir ml5">作品提交中</span>' str += '<span class="green_homework_btn_cir ml5">作品提交中</span>'
elsif Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") elsif Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && homework_common.anonymous_comment == 1 && User.current.allowed_to?(:as_teacher, homework_common.course)
str += '<span class="green_homework_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>'
else
str += '<span class="red_homework_btn_cir ml5">作品补交中</span>' str += '<span class="red_homework_btn_cir ml5">作品补交中</span>'
end end
elsif homework_common.homework_detail_manual.comment_status == 2 elsif homework_common.homework_detail_manual.comment_status == 2

8
app/views/homework_common/alert_forbidden_anonymous_comment.js.erb
View File

@ -1,6 +1,2 @@
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/alert_forbidden_anonymous', :locals => {:user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>'); var htmlvalue = "<%= escape_javascript(render :partial => 'student_work/alert_forbidden_anonymous', :locals => {:user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
showModal('ajax-modal', '500px'); pop_box_new(htmlvalue, 400, 178);
$('#ajax-modal').siblings().remove();
$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
"<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");

31
app/views/student_work/_alert_forbidden_anonymous.html.erb
View File

@ -1,16 +1,19 @@
<div id="popbox02"> <div id="muban_popup_box" style="width:400px;">
<div class="ni_con"> <div class="muban_popup_top">
<h2>禁用匿评</h2> <h3 class="fl">
<p> 提示
禁用匿评后学生将不能对作品进行互评，且匿评不能再开启，是否确定禁用匿评？ </h3>
</p> <a href="javascript:void(0);" class="muban_icons_close fr"></a>
<div class="ni_btn"> <div class="cl"></div>
<a href="javascript:" class="tijiao" onclick="clickOK('<%= forbidden_anonymous_comment_student_work_path(:homework=>@homework, :user_activity_id => user_activity_id, :hw_status => hw_status)%>');" style="margin-bottom: 20px;" > </div>
确&nbsp;&nbsp;定 <div class="muban_popup_con ml30 mr30 mt20 mb10 clear" >
</a> <p class="mb10 f14 text_c">评分比例将恢复默认值，您可以在评分设置中进行修改</p>
<a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;"> <% if @homework.anonymous_comment == 0%>
取&nbsp;&nbsp;消 <p class="mb10 f14 text_c">是否确定禁用匿评</p>
</a> <% else %>
</div> <p class="mb10 f14 text_c">是否确定启用匿评</p>
<% end %>
<a href="javascript:void(0);" class="fl sy_btn_blue" style="margin-left: 114px;" onclick="clickOK('<%= forbidden_anonymous_comment_student_work_path(:homework=>@homework, :user_activity_id => user_activity_id, :hw_status => hw_status)%>');">确定</a>
<a href="javascript:void(0);" class="fl sy_btn_grey ml5" onclick="hideModal();">取消</a>
</div> </div>
</div> </div>

8
app/views/student_work/forbidden_anonymous_comment.js.erb
View File

@ -4,3 +4,11 @@ sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
<% else %> <% else %>
sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>"); sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
<% end %> <% end %>
<% if @homework.anonymous_comment == 0 %>
var htmlvalue = '<div id="muban_popup_box" style="width:400px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
'<div class="muban_popup_con ml30 mr30 mt20 mb10 clear"><p class="mb10 f14 text_c">将于7天后自动启动该作业的匿评</p><p class="mb10 f14 text_c">您可以在匿评设置中进行修改</p>' +
'<a href="javascript:void(0);" class="btn btn-blue mt10" style="margin-left: 142px;" onclick="hideModal();">知道啦</a></div></div>';
pop_box_new(htmlvalue, 400, 178);
<% else %>
hideModal();
<% end %>

5
app/views/users/_homework_base_info.html.erb
View File

@ -111,6 +111,11 @@
<%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id),:class => "wpostOptionLink", <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id),:class => "wpostOptionLink",
:title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%> :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%>
</li> </li>
<% elsif activity.anonymous_comment == 1 %>
<li>
<%= link_to("启用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id),:class => "wpostOptionLink",
:title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%>
</li>
<% end %> <% end %>
<% if (activity.anonymous_comment == 1 && activity.is_open == 0) || (activity.anonymous_comment == 0 && comment_status == 3 && activity.is_open == 0) %> <% if (activity.anonymous_comment == 1 && activity.is_open == 0) || (activity.anonymous_comment == 0 && comment_status == 3 && activity.is_open == 0) %>
<li> <li>

30
lib/tasks/homework_publishtime.rake
View File

@ -41,19 +41,19 @@ namespace :homework_publishtime do
puts "--------------------------------homework_publish end" puts "--------------------------------homework_publish end"
end end
task :end => :environment do # task :end => :environment do
puts "--------------------------------homework_publish_end start" # puts "--------------------------------homework_publish_end start"
Rails.logger.info("log--------------------------------homework_publish_end start") # Rails.logger.info("log--------------------------------homework_publish_end start")
homework_commons = HomeworkCommon.where("end_time = '#{Date.today}'") # homework_commons = HomeworkCommon.where("end_time = '#{Date.today}'")
homework_commons.each do |homework| # homework_commons.each do |homework|
if homework.anonymous_comment == 1 # if homework.anonymous_comment == 1
homework_detail_manual = homework.homework_detail_manual # homework_detail_manual = homework.homework_detail_manual
if homework_detail_manual.comment_status == 1 # if homework_detail_manual.comment_status == 1
homework_detail_manual.update_column('comment_status', 3) # homework_detail_manual.update_column('comment_status', 3)
end # end
end # end
end # end
Rails.logger.info("log--------------------------------homework_publish_end end") # Rails.logger.info("log--------------------------------homework_publish_end end")
puts "--------------------------------homework_publish_end end" # puts "--------------------------------homework_publish_end end"
end # end
end end