From c24f9b8c3bb6fb851e1360c43b549ee0c524757f Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 7 Dec 2016 17:23:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E5=B0=8F=E9=BD=BF?= =?UTF-8?q?=E8=BD=AE=E8=8F=9C=E5=8D=95=E5=A2=9E=E5=8A=A0=E2=80=9C=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E5=8C=BF=E8=AF=84=E2=80=9D=E7=9A=84=E9=80=89=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0=E2=80=9C=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E5=8C=BF=E8=AF=84=E2=80=9D=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=81=E7=A6=81=E7=94=A8=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E6=88=AA=E6=AD=A2=E5=90=8E=E4=B9=9F?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=BC=96=E8=BE=91=E2=80=9C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E5=8C=BF=E8=AF=84=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 2 +- app/helpers/application_helper.rb | 4 ++- .../alert_forbidden_anonymous_comment.js.erb | 8 ++--- .../_alert_forbidden_anonymous.html.erb | 33 ++++++++++--------- .../forbidden_anonymous_comment.js.erb | 8 +++++ app/views/users/_homework_base_info.html.erb | 5 +++ lib/tasks/homework_publishtime.rake | 30 ++++++++--------- 7 files changed, 52 insertions(+), 38 deletions(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 3c0469e9b..d11259f15 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -1060,7 +1060,7 @@ class StudentWorkController < ApplicationController end 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_programing = @homework.homework_detail_programing if homework_detail_programing diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 75a0eb3f1..2b1f3fbb9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3710,7 +3710,9 @@ def get_hw_status homework_common end if Time.parse(homework_common.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") str += '作品提交中' - 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 += '教师评阅中' + else str += '作品补交中' end elsif homework_common.homework_detail_manual.comment_status == 2 diff --git a/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb b/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb index 354f217e2..a19815ca3 100644 --- a/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb +++ b/app/views/homework_common/alert_forbidden_anonymous_comment.js.erb @@ -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}) %>'); -showModal('ajax-modal', '500px'); -$('#ajax-modal').siblings().remove(); -$('#ajax-modal').before("" + - ""); -$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9"); \ No newline at end of file +var htmlvalue = "<%= escape_javascript(render :partial => 'student_work/alert_forbidden_anonymous', :locals => {:user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>"; +pop_box_new(htmlvalue, 400, 178); \ No newline at end of file diff --git a/app/views/student_work/_alert_forbidden_anonymous.html.erb b/app/views/student_work/_alert_forbidden_anonymous.html.erb index d1cdd8d57..328386a04 100644 --- a/app/views/student_work/_alert_forbidden_anonymous.html.erb +++ b/app/views/student_work/_alert_forbidden_anonymous.html.erb @@ -1,16 +1,19 @@ -
-
-

禁用匿评

-

- 禁用匿评后学生将不能对作品进行互评，且匿评不能再开启，是否确定禁用匿评？ -

-
- - 确  定 - - - 取  消 - -
+
+
+

+ 提示 +

+ +
-
\ No newline at end of file +
+

评分比例将恢复默认值，您可以在评分设置中进行修改

+ <% if @homework.anonymous_comment == 0%> +

是否确定禁用匿评

+ <% else %> +

是否确定启用匿评

+ <% end %> + 确定 + 取消 +
+
diff --git a/app/views/student_work/forbidden_anonymous_comment.js.erb b/app/views/student_work/forbidden_anonymous_comment.js.erb index 2dd4a88a4..729776685 100644 --- a/app/views/student_work/forbidden_anonymous_comment.js.erb +++ b/app/views/student_work/forbidden_anonymous_comment.js.erb @@ -3,4 +3,12 @@ $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(r sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity"); <% else %> sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>"); +<% end %> +<% if @homework.anonymous_comment == 0 %> + var htmlvalue = '

提示

'+ + '

将于7天后自动启动该作业的匿评

您可以在匿评设置中进行修改

' + + '知道啦
'; + pop_box_new(htmlvalue, 400, 178); +<% else %> + hideModal(); <% end %> \ No newline at end of file diff --git a/app/views/users/_homework_base_info.html.erb b/app/views/users/_homework_base_info.html.erb index 40381e686..53f968328 100644 --- a/app/views/users/_homework_base_info.html.erb +++ b/app/views/users/_homework_base_info.html.erb @@ -111,6 +111,11 @@ <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id),:class => "wpostOptionLink", :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%> + <% elsif activity.anonymous_comment == 1 %> +
  • + <%= link_to("启用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id),:class => "wpostOptionLink", + :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%> +
    • <% end %> <% if (activity.anonymous_comment == 1 && activity.is_open == 0) || (activity.anonymous_comment == 0 && comment_status == 3 && activity.is_open == 0) %>
  • diff --git a/lib/tasks/homework_publishtime.rake b/lib/tasks/homework_publishtime.rake index dac3c11af..c18d529e1 100644 --- a/lib/tasks/homework_publishtime.rake +++ b/lib/tasks/homework_publishtime.rake @@ -41,19 +41,19 @@ namespace :homework_publishtime do puts "--------------------------------homework_publish end" end - task :end => :environment do - puts "--------------------------------homework_publish_end start" - Rails.logger.info("log--------------------------------homework_publish_end start") - homework_commons = HomeworkCommon.where("end_time = '#{Date.today}'") - homework_commons.each do |homework| - if homework.anonymous_comment == 1 - homework_detail_manual = homework.homework_detail_manual - if homework_detail_manual.comment_status == 1 - homework_detail_manual.update_column('comment_status', 3) - end - end - end - Rails.logger.info("log--------------------------------homework_publish_end end") - puts "--------------------------------homework_publish_end end" - end + # task :end => :environment do + # puts "--------------------------------homework_publish_end start" + # Rails.logger.info("log--------------------------------homework_publish_end start") + # homework_commons = HomeworkCommon.where("end_time = '#{Date.today}'") + # homework_commons.each do |homework| + # if homework.anonymous_comment == 1 + # homework_detail_manual = homework.homework_detail_manual + # if homework_detail_manual.comment_status == 1 + # homework_detail_manual.update_column('comment_status', 3) + # end + # end + # end + # Rails.logger.info("log--------------------------------homework_publish_end end") + # puts "--------------------------------homework_publish_end end" + # end end \ No newline at end of file