Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework

app/controllers/bids_controller.rb

@@ -1007,6 +1007,7 @@ class BidsController < ApplicationController
   # 启动匿评
   def start_anonymous_comment
     @bid = Bid.find(params[:id])
+    @course = @bid.courses.first
     if(@bid.comment_status == 0)
       homeworks = @bid.homeworks
       if(homeworks && homeworks.size >= 2)

app/helpers/application_helper.rb

@@ -1927,31 +1927,30 @@ module ApplicationHelper
   end
 
   def anonymous_comment_notice(bid, course)
-     link =
+     case bid.comment_status
-         case bid.comment_status
+     when 0
-         when 0
+       @student_size  ||= searchStudent(course).size
-           @student_size  ||= searchStudent(course).size
+       @homework_size = bid.homeworks.size
-           @homework_size = bid.homeworks.size
+       percent = @homework_size.to_f / @student_size
-           percent = @homework_size.to_f / @student_size
+       confirm_info = "目前#{@student_size}个学生,总共提交了#{@homework_size}份作业,占#{number_to_percentage(percent * 100, precision: 1)}\n"
-           confirm_info = "目前#{@student_size}个学生,总共提交了#{@homework_size}份作业,占#{number_to_percentage(percent * 100, precision: 1)}\n"
+     when 1
-         when 1
+       @homework_evaluations = 0
-           @homework_evaluations = 0
+       bid.homeworks.map { |homework| @homework_evaluations += homework.homework_evaluations.count}
-           bid.homeworks.map { |homework| @homework_evaluations += homework.homework_evaluations.count}
+       teachers = "("
-           teachers = "("
+       teacher_members = searchTeacherAndAssistant(course)
-           teacher_members = searchTeacherAndAssistant(course)
+       teacher_members.each do |member|
-           teacher_members.each do |member|
+         if member == teacher_members.last
-             if member == teacher_members.last
+           teachers += member.user_id.to_s + ")"
-               teachers += member.user_id.to_s + ")"
+         else
-             else
+           teachers += member.user_id.to_s + ","
-               teachers += member.user_id.to_s + ","
-             end
-           end
-           @has_evaluations = 0
-           bid.homeworks.map { |homework| @has_evaluations += homework.rates(:quality).where("seems_rateable_rates.rater_id not in #{teachers}").count}
-
-           percent = @has_evaluations.to_f / @homework_evaluations
-           confirm_info = "目前总共分配了#{@homework_evaluations}份匿评作业,已评价#{@has_evaluations}份作业,占#{number_to_percentage(percent * 100, precision: 1)}\n"
          end
+       end
+       @has_evaluations = 0
+       bid.homeworks.map { |homework| @has_evaluations += homework.rates(:quality).where("seems_rateable_rates.rater_id not in #{teachers}").count}
+
+       percent = @has_evaluations.to_f / @homework_evaluations
+       confirm_info = "目前总共分配了#{@homework_evaluations}份匿评作业,已评价#{@has_evaluations}份作业,占#{number_to_percentage(percent * 100, precision: 1)}\n"
+     end
      confirm_info
   end
 end

app/views/bids/_bid_homework_show.html.erb

@@ -23,10 +23,10 @@
                   <%= link_to(bid.name, course_for_bid_path(bid), :class => 'bid_path') %>
                 </span>
                 <span style="float: right">
-                  <% if(User.current.logged? && (!Member.where('user_id = ? and course_id = ?', User.current.id, bid.courses.first.id).first.nil? && (Member.where('user_id = ? and course_id = ?', User.current.id, bid.courses.first.id).first.roles&Role.where('id = ? or id = ? or id =?',5, 10, 7)).size >0)) %>
+                  <% if User.current.logged? && is_cur_course_student(@course) %>
                      <% cur_user_homework = cur_user_homework_for_bid(bid) %>
-                      <% if cur_user_homework!= nil && cur_user_homework.count == 0 %>
+                      <% if cur_user_homework!= nil && cur_user_homework.empty? %>
-                          <%= link_to l(:label_commit_homework),new_homework_attach_path(bid)  %>
+                          <%= link_to l(:label_commit_homework),new_exercise_book_path(bid)  %>
                       <% else %>
                           <span style="color: green; float: right">
                             <%= l(:lable_has_commit_homework)%>