parent
020242a8c9
commit
9d0e39e708
|
@ -217,6 +217,10 @@ class CoursesController < ApplicationController
|
||||||
group.course_id = @course.id
|
group.course_id = @course.id
|
||||||
group.save
|
group.save
|
||||||
end
|
end
|
||||||
|
@canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
|
||||||
|
@is_remote = true
|
||||||
|
@members = searchStudent(@course)
|
||||||
|
@membercount = @members.count
|
||||||
@course_groups = @course.course_groups
|
@course_groups = @course.course_groups
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -229,6 +233,8 @@ class CoursesController < ApplicationController
|
||||||
@canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
|
@canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
|
||||||
@is_remote = true
|
@is_remote = true
|
||||||
@course_groups = @course.course_groups
|
@course_groups = @course.course_groups
|
||||||
|
@members = searchStudent(@course)
|
||||||
|
@membercount = @members.count
|
||||||
end
|
end
|
||||||
def join_group
|
def join_group
|
||||||
group = CourseGroup.find(params[:object_id])
|
group = CourseGroup.find(params[:object_id])
|
||||||
|
@ -283,11 +289,8 @@ class CoursesController < ApplicationController
|
||||||
@members = searchTeacherAndAssistant(@course)
|
@members = searchTeacherAndAssistant(@course)
|
||||||
when '2'
|
when '2'
|
||||||
@subPage_title = l :label_student_list
|
@subPage_title = l :label_student_list
|
||||||
if @course_group_id
|
@members = searchStudent(@course)
|
||||||
@members = search_student_in_group(@course, @course_group_id)
|
@membercount = @members.count
|
||||||
else
|
|
||||||
@members = searchStudent(@course)
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
@subPage_title = ''
|
@subPage_title = ''
|
||||||
@members = @course.member_principals.includes(:roles, :principal).all.sort
|
@members = @course.member_principals.includes(:roles, :principal).all.sort
|
||||||
|
|
|
@ -12,7 +12,7 @@ class CourseGroup < ActiveRecord::Base
|
||||||
before_destroy :set_member_nil
|
before_destroy :set_member_nil
|
||||||
|
|
||||||
attr_accessible :name
|
attr_accessible :name
|
||||||
|
validates :name, :presence => true, :length => {:maximum => 20}, :uniqueness => true
|
||||||
def set_member_nil
|
def set_member_nil
|
||||||
if self.members && self.members.count > 0
|
if self.members && self.members.count > 0
|
||||||
self.members.update_all("course_group_id = 0")
|
self.members.update_all("course_group_id = 0")
|
||||||
|
|
|
@ -1,4 +1,28 @@
|
||||||
|
<script type=" text/javascript" charset="utf-8">
|
||||||
|
function validate_groupname(value1) {
|
||||||
|
|
||||||
|
if(value1.length > 20) {
|
||||||
|
alert('<%= l(:label_limit_groupname) %>');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function validate_groupname_null(value1) {
|
||||||
|
|
||||||
|
if(value1.length == 0) {
|
||||||
|
alert('<%= l(:label_limit_groupname_null) %>');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function validate_update(name) {
|
||||||
|
value1 = document.getElementsByName(name)[0].value;
|
||||||
|
validate_groupname(value1);
|
||||||
|
document.getElementsByName(name)[0].value = "";
|
||||||
|
}
|
||||||
|
function validate_add_group() {
|
||||||
|
value1 = document.getElementsByName("group_name")[0].value;
|
||||||
|
validate_groupname(value1);
|
||||||
|
validate_groupname_null(value1);
|
||||||
|
document.getElementsByName('group_name')[0].value = "";
|
||||||
|
}
|
||||||
|
</script>"
|
||||||
|
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
|
@ -6,7 +30,7 @@
|
||||||
<li style=" color:#8b8b8b;">分班:</li>
|
<li style=" color:#8b8b8b;">分班:</li>
|
||||||
|
|
||||||
<li class="classbox">
|
<li class="classbox">
|
||||||
<% course_member_count = l(:label_all) + "(" + @course.members.count.to_s + "人)" %>
|
<% course_member_count = l(:label_all) + "(" + @membercount.to_s + "人)" %>
|
||||||
<%= form_tag( searchgroupmembers_course_path(@course, :group_id => 0), method: 'get',:remote=>true) do %>
|
<%= form_tag( searchgroupmembers_course_path(@course, :group_id => 0), method: 'get',:remote=>true) do %>
|
||||||
|
|
||||||
|
|
||||||
|
@ -30,9 +54,9 @@
|
||||||
<li>
|
<li>
|
||||||
<%= form_tag(updategroupname_course_path(@course,:group_id => group.id), method: 'get', remote:true, update: 'group_name') do %>
|
<%= form_tag(updategroupname_course_path(@course,:group_id => group.id), method: 'get', remote:true, update: 'group_name') do %>
|
||||||
<span id="add_tag_<%= group.id %>" style="display:none; vertical-align: middle;" class=" f_l">
|
<span id="add_tag_<%= group.id %>" style="display:none; vertical-align: middle;" class=" f_l">
|
||||||
<%= text_field_tag "group_name", params[:group_name], :size=>10, :class=>"isTxt w90 f_l", :style=>"padding: 0px", :max => 100 %>
|
<%= text_field_tag "group_name", params[:group_name],:name => "group_name#{group.id}", :size=>10, :class=>"isTxt w90 f_l", :style=>"padding: 0px", :max => 20 %>
|
||||||
<!--<input type="button" class="submit f_l" onclick="addTag();" style="width: 43px"/>-->
|
<!--<input type="button" class="submit f_l" onclick="addTag();" style="width: 43px"/>-->
|
||||||
<%= submit_tag '', class: "submit f_l", style: "width: 43px;height: 21px;background: url(/images/btn.png) no-repeat 0 0;" %>
|
<%= submit_tag '', class: "submit f_l", :onclick => "validate_update('group_name#{group.id}')", style: "width: 43px;height: 21px;background: url(/images/btn.png) no-repeat 0 0;" %>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
</li>
|
</li>
|
||||||
|
@ -47,7 +71,7 @@
|
||||||
<%= form_tag( addgroups_course_path(@course), method: 'get',:remote=>true) do %>
|
<%= form_tag( addgroups_course_path(@course), method: 'get',:remote=>true) do %>
|
||||||
|
|
||||||
<%= text_field_tag "group_name", params[:group_name], size: "20", class: "isTxt w90 f_l", style: "padding: 0px", maxlength: "100" %>
|
<%= text_field_tag "group_name", params[:group_name], size: "20", class: "isTxt w90 f_l", style: "padding: 0px", maxlength: "100" %>
|
||||||
<%= submit_tag '', class: "submit f_l", style: "width: 43px;height: 21px;background: url(/images/btn.png) no-repeat 0 0;" %>
|
<%= submit_tag '', class: "submit f_l",:onclick => "validate_add_group()", style: "width: 43px;height: 21px;background: url(/images/btn.png) no-repeat 0 0;" %>
|
||||||
<%= link_to_function '', "$('#add_tag04').slideToggle();", class: "submit_2", style: "width: 43px"%>
|
<%= link_to_function '', "$('#add_tag04').slideToggle();", class: "submit_2", style: "width: 43px"%>
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<div >
|
<div >
|
||||||
<% if @group %>
|
<% if User.current.logged? && User.current.member_of_course?(@course) && @group %>
|
||||||
<% if !@canShowCode %>
|
<% if !@canShowCode %>
|
||||||
<%= join_in_course_group(@course.course_groups,@group, User.current) %>
|
<%= join_in_course_group(@course.course_groups,@group, User.current) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -572,6 +572,8 @@ zh:
|
||||||
label_member:
|
label_member:
|
||||||
label_search_member_count: 共搜索到
|
label_search_member_count: 共搜索到
|
||||||
label_member_people: 人
|
label_member_people: 人
|
||||||
|
label_limit_groupname: 组别名不能超出20字符
|
||||||
|
label_limit_groupname_null: 组别名不能为空
|
||||||
label_member_new: 添加成员
|
label_member_new: 添加成员
|
||||||
label_member_plural: 成员
|
label_member_plural: 成员
|
||||||
label_tracker: 跟踪标签
|
label_tracker: 跟踪标签
|
||||||
|
|
Loading…
Reference in New Issue