diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index c3f36636f..6b3097d43 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -178,22 +178,19 @@ class CoursesController < ApplicationController def searchmembers @subPage_title = l :label_student_list - @render_file = 'member_list' - @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1' - @is_remote = true + @canShowCode = User.current.allowed_to?(:as_teacher,@course) && params[:role] != '1' + # @is_remote = true @score_sort_by = "desc" 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(0,0,0,"desc"), q) - + results = searchmember_by_name(student_homework_score(0,0,0,"desc"), q) elsif params[:ingroup] @group = CourseGroup.find(params[:search_group_id]) - @results = searchmember_by_name(student_homework_score(@group.id,0,0,"desc"), q) + results = searchmember_by_name(student_homework_score(@group.id,0,0,"desc"), q) end @is_remote = true - @result_count = @results.count - @results = paginateHelper @results, 10 + @result_count = results.count + @results = paginateHelper results, 10 @search_name = q end diff --git a/app/views/courses/_course_student.html.erb b/app/views/courses/_course_student.html.erb index c85f3e158..e95e1d901 100644 --- a/app/views/courses/_course_student.html.erb +++ b/app/views/courses/_course_student.html.erb @@ -10,6 +10,7 @@ <% end %> <% end %> 搜索 + <%= link_to l(:label_export_excel), export_course_member_excel_course_path(@course,:format => 'xls'),:class=>'xls'%>
@@ -18,6 +19,8 @@
- <%= render :partial => 'new_member_list', :locals => {:members => members} %> +
+ <%= render :partial => 'new_member_list', :locals => {:members => members} %> +
\ No newline at end of file diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb index b7341e066..8fb399037 100644 --- a/app/views/courses/_new_member_list.html.erb +++ b/app/views/courses/_new_member_list.html.erb @@ -64,7 +64,7 @@ <% else%>

diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb index e5a87da11..ce336373b 100644 --- a/app/views/courses/member.html.erb +++ b/app/views/courses/member.html.erb @@ -1,49 +1,3 @@ - -

<%= @subPage_title%>

diff --git a/app/views/courses/searchmembers.js.erb b/app/views/courses/searchmembers.js.erb index efe47a9c0..1d3c0ad21 100644 --- a/app/views/courses/searchmembers.js.erb +++ b/app/views/courses/searchmembers.js.erb @@ -1,4 +1,4 @@ /** * Created by Administrator on 2014/12/2. */ -$("#member_content").html("<%= escape_javascript( render :partial => @render_file, :locals => {:members => @results})%>"); \ No newline at end of file +$("#member_content").html("<%= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @results})%>"); \ No newline at end of file diff --git a/public/javascripts/course.js b/public/javascripts/course.js index 9bc784e70..3c296699b 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -1,3 +1,50 @@ +/////////////////////////////////////////////////////////////// +function check_groupname(course_id) { + var $group_name = $('#group_name'); + $.get( + '<%=valid_ajax_course_path%>', + { valid: "name", + value: document.getElementById('group_name').value, + course_id: course_id }, + function (data) { + if (!data.valid) { + alert(data.message); + } + }); +} + +function validate_groupname(value1) { + if(value1.length > 20) { + alert('<%= l(:label_limit_groupname) %>'); + } +} + +function checkclass(value) { + for(var i = 0; i < document.getElementsByName("check_group_name").length; i++) { + if(document.getElementsByName("check_group_name")[i].id == value) { + document.getElementById(value).className = "selected"; + } + else { + document.getElementsByName("check_group_name")[i].className = "classbox"; + } + } +} +function validate_groupname_null(value1) { + value1 = value1.trim(); + if(value1.length == 0 ) { + alert('<%= l(:label_limit_groupname_null) %>'); + } +} +function validate_update(name) { + value1 = document.getElementById(name).value; + validate_groupname(value1); + +} +function validate_add_group() { + check_groupname(); +} +/////////////////////////////////////////////////////////////// + //验证搜索时输入名字 function regexName(content) {