diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index ae6ad4ce3..e0d7feff5 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -333,10 +333,11 @@ class CoursesController < ApplicationController case params[:role] when '1' @subPage_title = l :label_teacher_list - @members = searchTeacherAndAssistant(@course) + @members = @teachers when '2' @subPage_title = l :label_student_list - @@member_scores = student_homework_score + teachers = @teachers.map{|teacher| teacher.user_id}.join(",") + @@member_scores = student_homework_score teachers @members = @@member_scores # @member_scores = @@member_scores # @members = searchStudent_sort(@course, 'desc', @@member_scores) @@ -880,9 +881,7 @@ class CoursesController < ApplicationController end end - def student_homework_score - teachers = find_course_teachers(@course) - + def student_homework_score teachers homework_scores = Member.find_by_sql("SELECT id, user_id,course_id, course_group_id,created_on,IFNULL(SUM(CASE WHEN t_score <> 0 AND t_score IS NOT NULL THEN t_score ELSE s_score END),0) as score FROM ( SELECT members.id as id, members.user_id AS user_id, members.course_id AS course_id, members.created_on as created_on,members.course_group_id AS course_group_id, diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb index 25be8709f..9b3a0443d 100644 --- a/app/views/courses/_member_list.html.erb +++ b/app/views/courses/_member_list.html.erb @@ -24,35 +24,46 @@
<% if members.any? %> <% if @result_count %> -<%= l(:label_search_member_count) %><%= @result_count %><%= l(:label_member_people) %>
++ <%= l(:label_search_member_count) %> + <%= @result_count %> + <%= l(:label_member_people) %> +
<% end %><%= l(:label_no_data) %>