diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index e31d2d256..4b499a3f8 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -638,7 +638,11 @@ class CoursesController < ApplicationController JOIN students_for_courses ON students_for_courses.student_id = members.user_id AND students_for_courses.course_id = members.course_id WHERE members.course_id = #{@course.id} AND members.course_group_id = #{@group.id} ORDER BY score desc") - + # if @order == "student_id" + # @members = @course.members.where(:course_group_id => @group.id).joins("join user_extensions on members.user_id = user_extensions.user_id").select{|m| m.roles.to_s.include?("Student")}.reorder("student_id #{@sort}") + # else + # @members = @course.members.where(:course_group_id => @group.id).joins("join users on members.user_id = users.id").select{|m| m.roles.to_s.include?("Student")}.reorder("CONVERT(lastname USING gbk) COLLATE gbk_chinese_ci #{@sort}, login #{@b_sort}") + # end if q.nil? || q == "" else members = [] diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb index dab6f2359..d053432d7 100644 --- a/app/views/homework_common/_homework_index_list.html.erb +++ b/app/views/homework_common/_homework_index_list.html.erb @@ -29,7 +29,11 @@

- 创建于<%=time_from_now homework_common.created_at %> + <% if homework_common.homework_detail_manual.try(:comment_status) == 0 %> + 创建于<%=time_from_now homework_common.created_at %> + <% else %> + 发布于<%=time_from_now homework_common.publish_time %> + <% end %> <% if [1,2,3,4,5,6].include?(homework_common.homework_detail_manual.try(:comment_status)) %> <% if @is_teacher %>