diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 35e034603..2721c57c7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -759,6 +759,18 @@ class ApplicationController < ActionController::Base end end + def paginateHelper_for_members obj, pre_size=10 + @obj_count = StudentsForCourse.find_by_sql("select count(id) as mem_count from students_for_courses where course_id = #{@course.id}")[0][:mem_count].to_s.to_i + @obj_pages = Paginator.new @obj_count, pre_size, params['page'] + if obj.kind_of? ActiveRecord::Base or obj.kind_of? ActiveRecord::Relation + obj.limit(@obj_pages.per_page).offset(0) + elsif obj.kind_of? Array + obj[0, @obj_pages.per_page] + else + logger.error "[ApplicationController] Error : application_controller#paginateHelper ===> unknow category: #{obj.class}" + raise RuntimeError, 'unknow type, Please input you type into this helper.' + end + end #查找首页相关信息 def find_first_page diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index ffdd51762..21199f6f9 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -23,7 +23,7 @@ class CoursesController < ApplicationController before_filter :require_login, :only => [:join, :unjoin] #before_filter :allow_join, :only => [:join] - @@result = nil + def join if User.current.logged? course = Course.find_by_id params[:object_id] @@ -213,12 +213,13 @@ class CoursesController < ApplicationController q = "#{params[:name].strip}" #(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank? if params[:incourse] - @results = searchmember_by_name(student_homework_score, q) + @results = searchmember_by_name(student_homework_score(0,0,0), q) + elsif params[:ingroup] @group = CourseGroup.find(params[:search_group_id]) - @results =searchgroupmember_by_name(student_homework_score, @group, q) + @results = searchmember_by_name(student_homework_score(@group.id,0,0), q) end - + @is_remote = true @result_count = @results.count @results = paginateHelper @results @@ -287,7 +288,7 @@ class CoursesController < ApplicationController @group = group @course_groups = @course.course_groups - @membercount = @members.count + search_group_members group end def unjoin_group @@ -299,7 +300,6 @@ class CoursesController < ApplicationController @group = group @course_groups = @course.course_groups - @membercount = @members.count search_group_members group end def searchgroupmembers @@ -309,15 +309,19 @@ class CoursesController < ApplicationController @is_remote = true if params[:group_id] && params[:group_id] != "0" @group = CourseGroup.find(params[:group_id]) - @results = student_homework_score.find_all {|mem| mem.course_group_id == group.id} + + @results = student_homework_score(@group.id,0, 0) + @results = paginateHelper @results, 10 + + else - @results = student_homework_score + page_from = params[:page].nil? ? 0 : (params[:page].to_i - 1) + @results = student_homework_score(0,page_from, 10) + @results = paginateHelper_for_members @results, 10 end - @@result = @results - @members = searchStudent(@course) - @membercount = @members.count - @results = paginateHelper @results + + end @@ -325,30 +329,36 @@ class CoursesController < ApplicationController ## 有角色参数的才是课程,没有的就是项目 if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course))) @render_file = 'member_list' - @teachers= searchTeacherAndAssistant(@course) + @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1' - @role = params[:role] + @role = params[:role].nil? ? '2':params[:role] + @is_remote = true @course_groups = @course.course_groups if @course.course_groups @show_serch = params[:role] == '2' - case params[:role] + case @role when '1' @subPage_title = l :label_teacher_list - @members = @teachers + @members = searchTeacherAndAssistant(@course) + @members = paginateHelper @members, 10 when '2' @subPage_title = l :label_student_list - @members = student_homework_score + page = params[:page].nil? ? 0 : (params['page'].to_i - 1) + @members = student_homework_score(0,page, 10) + + @members = paginateHelper_for_members @members, 10 - # @member_scores = @@member_scores - # @members = searchStudent_sort(@course, 'desc', @@member_scores) - @membercount = @members.count + end + respond_to do |format| + if params[:page] + format.js else - @subPage_title = '' - @members = @course.member_principals.includes(:roles, :principal).all.sort + format.html {render :layout => 'base_courses'} + end + end - @@result = @members - @members = paginateHelper @members - render :layout => 'base_courses' + + # render :layout => 'base_courses' else render_403 end @@ -356,19 +366,19 @@ class CoursesController < ApplicationController end def member_score_sort - @teachers= searchTeacherAndAssistant(@course) - @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1' - @role = params[:role] - @course_groups = @course.course_groups if @course.course_groups - @show_serch = params[:role] == '2' - @subPage_title = l :label_student_list - @render_file = 'member_list' - - unless @@result.nil? - @results = @@result.reverse - @@result = @results - end - @results = paginateHelper @results + # @teachers= searchTeacherAndAssistant(@course) + # @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1' + # @role = params[:role] + # @course_groups = @course.course_groups if @course.course_groups + # @show_serch = params[:role] == '2' + # @subPage_title = l :label_student_list + # @render_file = 'member_list' + # @results = params[:result] if params[:result] + # unless @result.nil? + # @results = @result.reverse + # + # end + # @results = paginateHelper @results end # 显示每个学生的作业评分详情 def show_member_score @@ -377,17 +387,9 @@ class CoursesController < ApplicationController respond_to do |format| format.html {render :layout => 'course_base'} format.js - end - end - - #判断指定用户是否为课程教师 - def isCourseTeacher(id) - result = false - if @teachers.find_by_user_id(id) != nil - result = true end - result + end def handle_course courses, activities @@ -880,11 +882,13 @@ class CoursesController < ApplicationController end end - def student_homework_score + def student_homework_score(groupid,start_from, nums) #teachers = find_course_teachers(@course) + start_from = start_from * nums sql = ActiveRecord::Base.connection() + + homework_scores = Member.find_by_sql("call member_score(#{@course.id},#{groupid},#{start_from},#{nums})") - homework_scores = Member.find_by_sql("call member_score(#{@course.id})") sql.close() homework_scores end @@ -900,10 +904,10 @@ class CoursesController < ApplicationController @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1' @is_remote = true - @members = searchStudent(@course) - @membercount = @members.count - @results = student_homework_score.find_all {|mem| mem.course_group_id == group.id} - @@result = @results - @results = paginateHelper @results + + page_from = params[:page].nil? ? 0 : (params[:page].to_i - 1) + @results = student_homework_score(group.id,0,0) + @results = paginateHelper @results, 10 + end end diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 867c2a302..ce899eff5 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -129,7 +129,7 @@ class MembersController < ApplicationController member = Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id) role = Role.find_by_id(params[:membership][:role_ids]) # 这里的判断只能通过角色名,可以弄成常量 - if role.name == "学生" + if role.name == "学生" || role.name == "Student" StudentsForCourse.create(:student_id => user_id, :course_id =>@course.id) end members << member @@ -210,7 +210,7 @@ class MembersController < ApplicationController if (params[:membership][:role_ids]) role = Role.find(params[:membership][:role_ids][0]) # 这里的判断只能通过角色名,可以弄成常量 - if role.name == "学生" + if role.name == "学生" || role.name == "Student" StudentsForCourse.create(:student_id => @member.user_id, :course_id =>@course.id) else joined = StudentsForCourse.where('student_id = ? and course_id = ?', @member.user_id,@course.id) diff --git a/app/models/query.rb b/app/models/query.rb index 550047c57..19bd1bed5 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -173,6 +173,7 @@ class Query < ActiveRecord::Base :string => [ "=", "~", "!", "!~", "!*", "*" ], :text => [ "~", "!~", "!*", "*" ], :integer => [ "=", ">=", "<=", "><", "!*", "*" ], + :integer_done => [ "=", ">=", "<=", "><", "!*", "*" ], :float => [ "=", ">=", "<=", "><", "!*", "*" ], :relation => ["=", "=p", "=!p", "!p", "!*", "*"] } @@ -217,6 +218,8 @@ class Query < ActiveRecord::Base case type_for(field) when :integer add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+$/) } + when :integer_done + add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+$/) || (v.match(/^[+-]?\d+$/) && (v.to_i<0 || v.to_i> 100)) } when :float add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+(\.\d*)?$/) } when :date, :date_past @@ -602,6 +605,12 @@ class Query < ActiveRecord::Base else sql = "#{db_table}.#{db_field} = #{value.first.to_i}" end + when :integer_done + if is_custom_filter + sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) = #{value.first.to_i})" + else + sql = "#{db_table}.#{db_field} = #{value.first.to_i}" + end when :float if is_custom_filter sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5})" diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index 202a2ee91..ea1f9b770 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -62,6 +62,11 @@ :is_student_batch_homework => @is_student_batch_homework}%> + <% if @is_teacher %> + + <% end %>
diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb index 860c86ba4..7e6407aa5 100644 --- a/app/views/courses/_member_list.html.erb +++ b/app/views/courses/_member_list.html.erb @@ -3,9 +3,11 @@ var classname = document.getElementById(id).className if(classname == 'st_up') { document.getElementById(id).className = 'st_down' + } else document.getElementById(id).className = 'st_up' + }
@@ -34,7 +36,7 @@
<% else %>

diff --git a/app/views/courses/_searchmembers.html.erb b/app/views/courses/_searchmembers.html.erb new file mode 100644 index 000000000..426c52ca5 --- /dev/null +++ b/app/views/courses/_searchmembers.html.erb @@ -0,0 +1,11 @@ +<% if @subPage_title && @subPage_title == l(:label_student_list)%> + <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:style => "margin-left: 5px; ",:remote=>true) do %> + <%= text_field_tag 'name', params[:name], name: "name", :class => 'f_1', :style => "height:15px; float: left;"%> + <% if @group %> + <%= hidden_field "search_group_id", params[:search_group_id],:value => "#{@group.id}", name: 'search_group_id' %> + <%= submit_tag l(:label_search_member), :name => "ingroup",:class => "f_2", :style => "float: left "%> + <% else %> + <%= submit_tag l(:label_search_member),:style => "float: left", :name => 'incourse',:onclick => "checkclass('group_name_0')",:class => "f_2"%> + <% end %> + <% end %> +<% end %> \ No newline at end of file diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb index 91d8badcc..313e50748 100644 --- a/app/views/courses/member.html.erb +++ b/app/views/courses/member.html.erb @@ -57,20 +57,10 @@ <%= stylesheet_link_tag 'course_group', :media => 'all' %>

-