diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index 9e3a4b836..7793ef097 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -6,8 +6,8 @@ class HomeworkCommonController < ApplicationController include StudentWorkHelper before_filter :find_course, :only => [:index,:new,:create] - before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr] - before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr] + before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr,:score_rule_set] + before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr,:score_rule_set] before_filter :member_of_course, :only => [:index] def index @@ -215,6 +215,11 @@ class HomeworkCommonController < ApplicationController end end + #评分设置 + def score_rule_set + + end + private #获取课程 def find_course diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index e5e1bf391..529c5ea72 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -457,7 +457,13 @@ class StudentWorkController < ApplicationController end end respond_to do |format| - format.html{redirect_to student_work_index_url(:homework => @homework.id)} + format.html{ + if params[:student_path] + redirect_to student_work_index_url(:homework => @homework.id) + else + redirect_to user_homeworks_user_path(User.current.id) + end + } end end diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb index b79964a8d..4a7cb900d 100644 --- a/app/views/courses/_course_activity.html.erb +++ b/app/views/courses/_course_activity.html.erb @@ -76,11 +76,13 @@ } $("#intro_content_show_<%= activity.id %>").click(function(){ $("#activity_description_<%= activity.id %>").toggleClass("maxh360"); + $("#activity_description_<%= activity.id%>").toggleClass("lh18"); $("#intro_content_show_<%= activity.id %>").hide(); $("#intro_content_hide_<%= activity.id %>").show(); }); $("#intro_content_hide_<%= activity.id %>").click(function(){ $("#activity_description_<%= activity.id %>").toggleClass("maxh360"); + $("#activity_description_<%= activity.id%>").toggleClass("lh18"); $("#intro_content_hide_<%= activity.id %>").hide(); $("#intro_content_show_<%= activity.id %>").show(); }); diff --git a/app/views/homework_common/score_rule_set.js.erb b/app/views/homework_common/score_rule_set.js.erb new file mode 100644 index 000000000..5ff42dff7 --- /dev/null +++ b/app/views/homework_common/score_rule_set.js.erb @@ -0,0 +1,6 @@ +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework, :student_path => false}) %>'); +showModal('ajax-modal', '350px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("" + + ""); +$('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed"); \ No newline at end of file diff --git a/app/views/student_work/_set_score_rule.html.erb b/app/views/student_work/_set_score_rule.html.erb index 7deed7fb8..508b89a1c 100644 --- a/app/views/student_work/_set_score_rule.html.erb +++ b/app/views/student_work/_set_score_rule.html.erb @@ -1,4 +1,7 @@ <%= form_for('new_form',:url => {:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id},:method => "post") do |f|%> + <% if student_path %> + <%=hidden_field_tag 'student_path', params[:student_path], :value => student_path %> + <% end %>
评分设置
diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb index 72ca36ca9..0ea5e7055 100644 --- a/app/views/student_work/index.html.erb +++ b/app/views/student_work/index.html.erb @@ -20,7 +20,7 @@ //设置评分规则 function set_score_rule(){ - $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework}) %>'); + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework,:student_path => true}) %>'); showModal('ajax-modal', '350px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index a9584c80e..b7981bdbc 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -44,11 +44,13 @@ } $("#intro_content_show_<%= user_activity.id %>").click(function(){ $("#activity_description_<%= user_activity.id %>").toggleClass("maxh360"); + $("#activity_description_<%= user_activity.id%>").toggleClass("lh18"); $("#intro_content_show_<%= user_activity.id %>").hide(); $("#intro_content_hide_<%= user_activity.id %>").show(); }); $("#intro_content_hide_<%= user_activity.id %>").click(function(){ $("#activity_description_<%= user_activity.id %>").toggleClass("maxh360"); + $("#activity_description_<%= user_activity.id%>").toggleClass("lh18"); $("#intro_content_hide_<%= user_activity.id %>").hide(); $("#intro_content_show_<%= user_activity.id %>").show(); }); diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 848417d3e..b4beb7aa3 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -68,6 +68,9 @@
  • <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => is_in_course),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink") %>
    • +
  • + <%= link_to("评分设置", score_rule_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true) %> +
  • <%= link_to("匿评设置", start_evaluation_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true) if homework_common.homework_detail_manual.comment_status == 1%>
    • diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb index ee3e05795..2e530d489 100644 --- a/app/views/users/_user_homework_list.html.erb +++ b/app/views/users/_user_homework_list.html.erb @@ -21,11 +21,13 @@ } $("#intro_content_show_<%= homework_common.id%>").click(function(){ $("#homework_description_<%= homework_common.id%>").toggleClass("maxh360"); + $("#homework_description_<%= homework_common.id%>").toggleClass("lh18"); $("#intro_content_show_<%= homework_common.id%>").hide(); $("#intro_content_hide_<%= homework_common.id%>").show(); }); $("#intro_content_hide_<%= homework_common.id%>").click(function(){ $("#homework_description_<%= homework_common.id%>").toggleClass("maxh360"); + $("#homework_description_<%= homework_common.id%>").toggleClass("lh18"); $("#intro_content_hide_<%= homework_common.id%>").hide(); $("#intro_content_show_<%= homework_common.id%>").show(); }); diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 38f895e4c..fb63f4fc0 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -62,27 +62,31 @@ <%= User.current.lastname + User.current.firstname %>老师您好！ <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.show_name + "老师")%>刚刚发布了一个作业：

    -

    课程名称：<%= ma.course_message.course.name %> - (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)

    -

    作业标题：<%= ma.course_message.name %>

    -

    提交截止：<%= ma.course_message.end_time %>  24点

    -

    匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点

    -

    匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点

    -

    迟交扣分：<%= ma.course_message.late_penalty %>分

    -

    缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分

    +
      +
    • 课程名称：<%= ma.course_message.course.name %> + (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
      • +
    • 作业标题：<%= ma.course_message.name %>
      • +
    • 提交截止：<%= ma.course_message.end_time %>  24点
      • +
    • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点
      • +
    • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点
      • +
    • 迟交扣分：<%= ma.course_message.late_penalty %>分
      • +
    • 缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分
      • +

    您可以修改作业内容、评分规则、匿评过程等，谢谢！

    <% else %>

    <%= User.current.lastname + User.current.firstname %>同学您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：

    -

    课程名称：<%= ma.course_message.course.name %> - (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)

    -

    作业标题：<%= ma.course_message.name %>

    -

    提交截止：<%= ma.course_message.end_time %>  24点

    -

    匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点

    -

    匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点

    -

    迟交扣分：<%= ma.course_message.late_penalty %>分

    -

    缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分

    +
      +
    • 课程名称：<%= ma.course_message.course.name %> + (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
      • +
    • 作业标题：<%= ma.course_message.name %>
      • +
    • 提交截止：<%= ma.course_message.end_time %>  24点
      • +
    • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点
      • +
    • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点
      • +
    • 迟交扣分：<%= ma.course_message.late_penalty %>分
      • +
    • 缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分
      • +

    请抓紧时间提交您的作品，谢谢！

    @@ -109,24 +113,16 @@ <%= User.current.lastname + User.current.firstname %>同学您好！ <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：

    -

    课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)

    -

    作业标题：<%= ma.course_message.name %>

    -

    提交截止：<%= ma.course_message.end_time %>  24点

    -

    匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点

    -

    匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点

    -

    迟交扣分：<%= ma.course_message.late_penalty %>分

    -

    缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分

    -

    请抓紧时间提交您的作品，谢谢！

    - <% else %> -

    <%= User.current.lastname + User.current.firstname %>老师您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：

    -

    课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)

    -

    作业标题：<%= ma.course_message.name %>

    -

    提交截止：<%= ma.course_message.end_time %>  24点

    -

    匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点

    -

    匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点

    -

    迟交扣分：<%= ma.course_message.late_penalty %>分

    -

    缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分

    -

    您可以修改作业内容、评分规则、匿评过程等，谢谢！

    +
      +
    • 课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)
      • +
    • 作业标题：<%= ma.course_message.name %>
      • +
    • 提交截止：<%= ma.course_message.end_time %>  24点
      • +
    • 匿评开始：<%= ma.course_message.homework_detail_manual.evaluation_start %>  24点
      • +
    • 匿评关闭：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点
      • +
    • 迟交扣分：<%= ma.course_message.late_penalty %>分
      • +
    • 缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分
      • +

      请抓紧时间提交您的作品，谢谢！

      +
    <% end %>
  •    截止时间快到了！
    • @@ -154,12 +150,12 @@ <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师' : '同学' %>您好！ <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>开启了匿评，作业详情如下：

    -

    课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)

    -

    作业标题：<%= ma.course_message.name %>

    -

    缺评扣分：<%= ma.course_message.homework_detail_manual.absence_penalty %>分

    -

    - 匿评截止：<%= ma.course_message.homework_detail_manual.evaluation_end %>  24点 -

    + <% unless User.current.allowed_to?(:as_teacher, ma.course_message.course)%>

    请您尽早完成匿评！如果您在规定时间内未完成匿评，一次将被扣<%= ma.course_message.homework_detail_manual.absence_penalty %>分。

    <% end%> @@ -184,8 +180,10 @@ <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！ <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>关闭了匿评，作业详情如下：

    -

    课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)

    -

    作业标题：<%= ma.course_message.name %>

    +
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -210,14 +208,14 @@

    <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！ <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败！ -

    失败原因：提交作品的人数低于2人

    -

    -

    作业详情如下：

    -

    课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)

    -

    作业标题：<%= ma.course_message.name %>

    -

    - 提交截止：<%= ma.course_message.end_time%>  24点 +

    +
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -304,16 +302,16 @@ <%= User.current.show_name %>同学您好！ <%= ma.course_message.reviewer_role == 3? "匿名用户" : (ma.course_message.user.show_name + "老师")%><%= ma.status == 0? "评阅了您的作品":"重新评阅了您的作品"%>。详情如下：

    -

    课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)

    -

    作业标题：<%=ma.course_message.student_work.homework_common.name %>

    - <% content = ma.content.gsub("作业评分：","").split("    评语：")%> -

    - 作品评分：<%= content[0] %>分 -

    - <% if content.size > 1 %> -
    作品评语：
    -
    <%= content[1] %>
    - <% end %> +

    本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>  24点结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。 期待您取得更大的进步！

    @@ -351,7 +349,7 @@
  • <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + - "#{ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"同学":"老师"}", + "#{ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"}", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %> ">回复了作品评论：
    • @@ -365,12 +363,12 @@ <%= User.current.show_name %>老师您好！ <%= ma.course_message.user.show_name%><%= ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"学生"%>回复了您的作品评论。详情如下：

    -
    回复内容：
    -
    <%= ma.course_message.notes %>
    -
    您的评论：
    -
    <%= ma.course_message.jour.comment %>
    -

    课程名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)

    -

    作业标题：<%=ma.course_message.jour.student_work.homework_common.name %>

    +
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -395,14 +393,12 @@ <%= User.current.lastname + User.current.firstname %> <%= User.current.allowed_to?(:as_teacher,ma.course_message.homework_common.course) ? '老师':'同学'%>您好！由于迟交作业，您及您的作品都不能参与以下作业的匿评。作业详情如下：

    - <% end %> diff --git a/config/routes.rb b/config/routes.rb index 649cfbb75..f7edee954 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -102,6 +102,7 @@ RedmineApp::Application.routes.draw do get 'stop_anonymous_comment' get 'alert_anonymous_comment' get 'start_evaluation_set' + get 'score_rule_set' post 'set_evaluation_attr' end collection do diff --git a/public/images/news_dot.png b/public/images/news_dot.png new file mode 100644 index 000000000..7dea0bbe4 Binary files /dev/null and b/public/images/news_dot.png differ diff --git a/public/images/news_dot2.png b/public/images/news_dot2.png new file mode 100644 index 000000000..3b9f9e88d Binary files /dev/null and b/public/images/news_dot2.png differ diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 22be12633..c1ddfa457 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1298,5 +1298,5 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c .list_style ol li{list-style-type: decimal;margin-left: 20px;} .list_style ul li{list-style-type: disc;margin-left: 20px;} -.list_style_disc {list-style-type:disc;margin-left:5px;} -.system_message_style li{color:#909090} +.ul_grey li {color:#909090; list-style-position:inside; padding-left:1px;list-style-image:url('../images/news_dot2.png')} +.ul_normal_color li {list-style-position:inside; padding-left:1px; list-style-image:url('../images/news_dot.png')}