From a4095adc59575f0eb84c64eeb5238c61230dd293 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 18 Jul 2015 10:30:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 47a3b59ae..14a508d40 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2345,6 +2345,6 @@ module ApplicationHelper #将文本内的/n转换为
def text_format text - text.gsub("\n","
").html_safe + text.gsub("<","<").gsub(">",">").gsub("\n","
").html_safe end end From 3ceb1e92bb85dbf583f7e2e83fd05698f9751307 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 18 Jul 2015 10:36:14 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=BC=96=E7=A8=8B?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=B8=AD=E7=9A=84=E6=B5=8B=E8=AF=95=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homework_common/_homework_detail_programing_form.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/homework_common/_homework_detail_programing_form.html.erb b/app/views/homework_common/_homework_detail_programing_form.html.erb index 008f88138..806768954 100644 --- a/app/views/homework_common/_homework_detail_programing_form.html.erb +++ b/app/views/homework_common/_homework_detail_programing_form.html.erb @@ -98,7 +98,7 @@
  • - 测试 +
    • @@ -116,7 +116,7 @@
  • - 测试 +
    • From 94ed3501f8cc5d4f2d1d2085189c33e0ad16463c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 18 Jul 2015 10:39:04 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=BD=AC=E4=B9=89=E5=A2=9E=E5=8A=A0&?= =?UTF-8?q?=E7=9A=84=E8=BD=AC=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 14a508d40..7b3d7bbe2 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2345,6 +2345,6 @@ module ApplicationHelper #将文本内的/n转换为
    def text_format text - text.gsub("<","<").gsub(">",">").gsub("\n","
    ").html_safe + text.gsub("&","&").gsub("<","<").gsub(">",">").gsub("\n","
    ").html_safe end end From 42d706a9618570f18f2a748afc701ee4d02c5086 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 18 Jul 2015 10:44:26 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=89=A3=E5=88=86=E8=A7=84=E5=88=99=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 28 +++++++++++++++++++++++++++ app/helpers/homework_common_helper.rb | 27 -------------------------- app/views/student_work/index.html.erb | 9 ++------- 3 files changed, 30 insertions(+), 34 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7b3d7bbe2..64a478187 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2347,4 +2347,32 @@ module ApplicationHelper def text_format text text.gsub("&","&").gsub("<","<").gsub(">",">").gsub("\n","
    ").html_safe end + + #评分规则显示 + def scoring_rules late_penalty,homework_id,is_teacher,absence_penalty=nil + if absence_penalty + if late_penalty.to_i == 0 && absence_penalty.to_i == 0 + notice = "尚未设置评分规则" + if is_teacher + notice += "，请 " + link_to("设置",edit_homework_common_path(homework_id),:class => "c_green") + end + elsif late_penalty.to_i != 0 && absence_penalty.to_i == 0 + notice = "迟交扣#{late_penalty}分，缺评扣分未设置" + elsif late_penalty.to_i == 0 && absence_penalty.to_i != 0 + notice = "迟交扣分未设置，缺评一个作品扣#{absence_penalty}分" + elsif late_penalty.to_i != 0 && absence_penalty.to_i != 0 + notice = "迟交扣#{late_penalty}分，缺评一个作品扣#{absence_penalty}分" + end + else + if late_penalty.to_i == 0 + notice = "尚未设置评分规则" + if is_teacher + notice += "，请 " + link_to("设置",edit_homework_common_path(homework_id),:class => "c_green") + end + else + notice = "迟交扣#{late_penalty}分" + end + end + notice.html_safe + end end diff --git a/app/helpers/homework_common_helper.rb b/app/helpers/homework_common_helper.rb index a2ff6dbab..81f817ee9 100644 --- a/app/helpers/homework_common_helper.rb +++ b/app/helpers/homework_common_helper.rb @@ -53,31 +53,4 @@ module HomeworkCommonHelper link end - #评分规则显示 - def scoring_rules late_penalty,homework_id,is_teacher,absence_penalty=nil - if absence_penalty - if late_penalty.to_i == 0 && absence_penalty.to_i == 0 - notice = "尚未设置评分规则" - if is_teacher - notice += "，请 " + link_to("设置",edit_homework_common_path(homework_id),:class => "c_green") - end - elsif late_penalty.to_i != 0 && absence_penalty.to_i == 0 - notice = "迟交扣#{late_penalty}分，缺评扣分未设置" - elsif late_penalty.to_i == 0 && absence_penalty.to_i != 0 - notice = "迟交扣分未设置，缺评一个作品扣#{absence_penalty}分" - elsif late_penalty.to_i != 0 && absence_penalty.to_i != 0 - notice = "迟交扣#{late_penalty}分，缺评一个作品扣#{absence_penalty}分" - end - else - if late_penalty.to_i == 0 - notice = "尚未设置评分规则" - if is_teacher - notice += "，请 " + link_to("设置",edit_homework_common_path(homework_id),:class => "c_green") - end - else - notice = "迟交扣#{late_penalty}分" - end - end - notice.html_safe - end end \ No newline at end of file diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb index 1eaee54af..7e4a818a9 100644 --- a/app/views/student_work/index.html.erb +++ b/app/views/student_work/index.html.erb @@ -165,15 +165,10 @@
    扣分标准：
    - 迟交扣 - <%= @homework.late_penalty%> - 分 <% if @homework.homework_type == 1%> - ,缺评一个作品扣 - <%= @homework.homework_detail_manual.absence_penalty%> - 分 + <%= scoring_rules @homework.late_penalty,@homework.id,@is_teacher,@homework.homework_detail_manual.absence_penalty%> <% else%> - 。 + <%= scoring_rules @homework.late_penalty,@homework.id,@is_teacher%> <% end%>
    From d0482fdb657692bf91a194abf2696701a533d99c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 18 Jul 2015 11:38:00 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_common_controller.rb | 2 +- app/controllers/student_work_controller.rb | 5 +++-- app/views/student_work/index.html.erb | 6 +++--- public/javascripts/course.js | 13 +++++++++---- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index 8b37ca8e4..6e6fa7d20 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -151,7 +151,7 @@ class HomeworkCommonController < ApplicationController @homework.description = params[:homework_common][:description] @homework.end_time = params[:homework_common][:end_time] @homework.publish_time = params[:homework_common][:publish_time] - @homework.homework_type = params[:homework_common][:homework_type] + @homework.homework_type = params[:homework_common][:homework_type] if params[:homework_common][:homework_type] unless @homework.late_penalty == params[:late_penalty] @homework.student_works.where("created_at > '#{@homework.end_time} 23:59:59'").each do |student_work| student_work.late_penalty = params[:late_penalty] diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 20cdc6659..dae0bcab6 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -13,8 +13,9 @@ class StudentWorkController < ApplicationController def index @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group] @is_teacher = User.current.allowed_to?(:as_teacher,@course) - unless @group == "0" || @group.nil? - group_students = CourseGroup.find_by_id(@group).users + course_group = CourseGroup.find_by_id(@group) if @group + if course_group + group_students = course_group.users if group_students.empty? student_in_group = '(0)' else diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb index 7e4a818a9..781277b57 100644 --- a/app/views/student_work/index.html.erb +++ b/app/views/student_work/index.html.erb @@ -48,9 +48,9 @@ <%= link_to "所有作品(#{@stundet_works.count})".html_safe,student_work_index_path(:homework => @homework.id), :class => "fl"%> <% if @show_all%> - - <%= select_tag(:late_penalty,options_for_select(course_group_list(@course),@group), {:class => "fl h22 w100 ml10"}) if @is_teacher %> - 搜索 + + <%= select_tag(:late_penalty,options_for_select(course_group_list(@course),@group), {:class => "fl h22 w100 ml10"}) if(@is_teacher && course_group_list(@course).count > 0) %> + 搜索 <%= link_to("缺评情况",student_work_absence_penalty_student_work_index_path(:homework => @homework.id), :class => "student_work_search fl", :target => "_blank") if((@is_teacher || User.current.admin?) && @homework.homework_type == 1) %> <% end%> <% if @is_teacher%> diff --git a/public/javascripts/course.js b/public/javascripts/course.js index db1f761f2..7c165a4c6 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -861,14 +861,19 @@ function clickOK(path) }); } //查询 -function SearchByName(name,group,url,event) +function SearchByName(url,event) { var keycode = (event.keyCode ? event.keyCode : event.which); if(keycode == '13'){ - location.href = url + "&name=" + name + "&group=" + group; + location.href = url + "&name=" + $("#course_student_name").val() + "&group=" + $("#late_penalty").val(); } } -function SearchByName_1(name,group,url) +function SearchByName_1(url) { - location.href = url + "&name=" + name + "&group=" + group; + if($("#late_penalty").val() == null){ + location.href = url + "&name=" + $("#course_student_name").val() + } + else{ + location.href = url + "&name=" + $("#course_student_name").val() + "&group=" + $("#late_penalty").val(); + } } From 1cc89ceadfd609fe406ae3872ce6985155e8fbdd Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 18 Jul 2015 13:41:17 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/words/_journal_reply_items.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb index a0998f539..db848d2cd 100644 --- a/app/views/words/_journal_reply_items.html.erb +++ b/app/views/words/_journal_reply_items.html.erb @@ -6,7 +6,7 @@
    <% if show_name %> - <%= image_tag url_to_avatar(journal.user),:width => '30',:height => '30' %> + <%= image_tag url_to_avatar(reply.user),:width => '30',:height => '30' %> <% else %> <%= image_tag url_to_avatar(nil),:width => '30',:height => '30' %> <% end %> From e01f622bc0e24ca97226dc46404bf39c2c2dcb6a Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 18 Jul 2015 15:06:46 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=EF=BC=8C?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E6=88=91=E7=9A=84=E5=85=B6=E4=BB=96=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=90=8E=E4=B8=8D=E5=8F=AF=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/searchone4reload.html.erb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/views/files/searchone4reload.html.erb b/app/views/files/searchone4reload.html.erb index 4512e52dd..75dd7bcab 100644 --- a/app/views/files/searchone4reload.html.erb +++ b/app/views/files/searchone4reload.html.erb @@ -2,26 +2,29 @@ <% if file.is_public? || User.current.member_of_course?(course) %>
    - <%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s,:class => "c_dblue f_14 f_b f_l hiddent" %> + <%= link_to truncate(file.filename,length: 35, omission: '...'), + download_named_attachment_path(file.id, file.filename), + :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %> <% if User.current.logged? %> <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %> <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %> <% if delete_allowed && file.container_id == @course.id && file.container_type == "Course" %> - - <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open c_blue",:method => :post %> - + + <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open c_blue",:method => :post %> + <% else %> <% end %> <% else %> <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %> <% end %> + <%= file_preview_tag(file, class: 'f_l re_open') %> <% else %> <% end %>
    -
    +

    文件大小：<%= number_to_human_size(file.filesize) %>

    <%= link_to( l(:button_delete), attachment_path(file), :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "f_r re_de") if delete_allowed && file.container_id == @course.id && file.container_type == "Course"%>