diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index 7808691cf..c0685ea0a 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -92,7 +92,7 @@ class HomeworkCommonController < ApplicationController @homework.publish_time = params[:homework_common][:publish_time] @homework.homework_type = params[:homework_common][:homework_type] unless @homework.late_penalty == params[:late_penalty] - @homework.student_works.where("created_at > #{@homework.end_time}").each do |student_work| + @homework.student_works.where("created_at > '#{@homework.end_time} 23:59:59'").each do |student_work| student_work.late_penalty = params[:late_penalty] student_work.save end diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 596d5ba51..63d25acbd 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -278,7 +278,7 @@ class StudentWorkController < ApplicationController work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")" @stundet_works = StudentWork.find_by_sql("SELECT * FROM (SELECT *,(all_count - has_count) AS absence FROM( SELECT * , - (SELECT evaluation_num FROM homework_detail_manuals WHERE homework_detail_manuals.homework_common_id = #{@homework.id}) AS all_count, + (SELECT COUNT(*) FROM `student_works_evaluation_distributions` WHERE user_id = student_works.user_id AND student_work_id IN #{work_ids}) AS all_count, (SELECT COUNT(*) FROM `student_works_scores` WHERE user_id = student_works.user_id AND student_work_id IN #{work_ids}) AS has_count FROM `student_works` WHERE homework_common_id = #{@homework.id} diff --git a/app/helpers/api_helper.rb b/app/helpers/api_helper.rb index 6c17f8566..d3dc441ae 100644 --- a/app/helpers/api_helper.rb +++ b/app/helpers/api_helper.rb @@ -93,7 +93,7 @@ module ApiHelper def homework_status_desc homework if homework.homework_type == 1 && homework.homework_detail_manual #匿评作业 if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") - link = "启动匿评".html_safe + link = "截止日期之前不可启动匿评" elsif homework.student_works.count >= 2 #作业份数大于2 case homework.homework_detail_manual.comment_status when 1 @@ -104,10 +104,10 @@ module ApiHelper link = " 匿评结束" end else - link = "学生提交作业数大于2时才可以启动匿评" + link = "提交作业数大于2才可启动匿评" end else - link = "未开启匿评作业不可以启动匿评" + link = "未开启匿评作业不可启动匿评" end link end diff --git a/app/views/poll/poll_result.html.erb b/app/views/poll/poll_result.html.erb index 47f3b179d..4145ec1b2 100644 --- a/app/views/poll/poll_result.html.erb +++ b/app/views/poll/poll_result.html.erb @@ -1,5 +1,5 @@ <%= stylesheet_link_tag 'polls', :media => 'all' %> -
+

<%= @poll.polls_name.empty? ? l(:label_poll_new) : @poll.polls_name %> diff --git a/app/views/student_work/_student_work.html.erb b/app/views/student_work/_student_work.html.erb index 6e4cc65f1..c555b36a9 100644 --- a/app/views/student_work/_student_work.html.erb +++ b/app/views/student_work/_student_work.html.erb @@ -52,7 +52,7 @@ 缺评扣分  <%= student_work.absence_penalty%> 分, 最终成绩为 -  <%= score%> 分。 +  <%= format("%.1f",score)%> 分。

<% else%> @@ -62,7 +62,7 @@ 迟交扣分  <%= student_work.late_penalty%> 分, 最终成绩为 -  <%= score%> 分。 +  <%= format("%.1f",score)%> 分。
<% end%> <% end%>