diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 017f9bec1..f0cb3aacd 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -6,6 +6,46 @@ class ManagementsController < ApplicationController include SortHelper include UsersHelper include ApplicationHelper + # 专业列表 + def profession + @syllabus=Syllabus.where("0=0") + @menu_type=11 + @sub_type=1 + major_level_option=params[:major_level_option] + discipline_category_option=params[:discipline_category_option] + first_level_discipline_option=params[:first_level_discipline_option] + if major_level_option!='0' + @syllabus=@syllabus.where(:major_level=>major_level_option) + else + @syllabus=@syllabus + end + + if discipline_category_option !=nil + @syllabus=@syllabus.where(:discipline_category_id=>discipline_category_option) + end + + if first_level_discipline_option!=nil + @syllabus=@syllabus.where(:first_level_discipline_id=>first_level_discipline_option) + end + @syllabus_count = @syllabus.count + limit = 20 + @is_remote = true + @syllabus_pages = Paginator.new @syllabus_count, limit, params['page'] || 1 + @offset ||= @syllabus_pages.offset + @syllabus = paginateHelper @syllabus, limit + + respond_to do |format| + format.js + format.html + end + + end + + # 实训适用课程 + def applicable_course + @majorcourse=MajorCourse.where("0=0") + + end # 单位部门列表 def departments @menu_type = 6 @@ -105,10 +145,13 @@ class ManagementsController < ApplicationController @menu_type = 2 @sub_type = 1 @syllabus = Syllabus.where("0=0") + + @sx_order = params[:sx_order].blank? ? "desc" : params[:sx_order] unless params[:school_id] || params[:search] || params[:keyword] || params[:status] user_exs=UserExtensions.where(:user_id=> @syllabus.map(&:user_id)) @schools = School.where(:id =>user_exs.map(&:school_id)) end + major_level_option=params[:major_level_option] discipline_category_option=params[:discipline_category_option] first_level_discipline_option=params[:first_level_discipline_option] @@ -120,29 +163,34 @@ class ManagementsController < ApplicationController else @syllabus=@syllabus end + if discipline_category_option !=nil @syllabus=@syllabus.where(:discipline_category_id=>discipline_category_option) end + if first_level_discipline_option!=nil @syllabus=@syllabus.where(:first_level_discipline_id=>first_level_discipline_option) end + if syllabus_major_option!=nil @syllabus=@syllabus.where(:major_id=>syllabus_major_option) end + if params[:school_id] && params[:school_id] != '0' @syllabus = Syllabus.includes(:user => {:user_extensions => []}).where("user_extensions.school_id = #{params[:school_id]}") else @syllabus = @syllabus.where("0=0") end - if "u_name" == keyword - if search.blank? - @syllabus = @syllabus - else - user_id = User.where("concat(lastname, firstname) like '%#{search}%'") - @syllabus = @syllabus.includes(:user).where("concat(users.lastname, users.firstname) like '%#{search}%'") - end + + if search.blank? + @syllabus = @syllabus else - @syllabus= @syllabus.where("user_id like '%#{search}%'") + if "u_name" == keyword + user_id = User.where("concat(lastname, firstname) like '%#{search}%'") + @syllabus = @syllabus.includes(:user).where("concat(users.lastname, users.firstname) like '%#{search}%'") + else + @syllabus= @syllabus.where("user_id like '%#{search}%'") + end end @syllabus_count = @syllabus.count limit = 20 @@ -160,6 +208,7 @@ class ManagementsController < ApplicationController def classroom_classment @menu_type = 2 @sub_type = 2 + @sx_order = params[:sx_order].blank? ? "desc" : params[:sx_order] @courses = Course.where("0=0") # @courses = @courses.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") @timing=Course.where(:is_end=>false).count @@ -172,22 +221,22 @@ class ManagementsController < ApplicationController keyword = params[:keyword].blank? ? "u_name" : params[:keyword] # 根据姓名/课程名搜索 status = params[:status].to_i if params[:school_id] && params[:school_id] != '0' - @courses =Course.joins("join users u on courses.tea_id = u.id").joins("join user_extensions ue on u.id = ue.user_id").where("ue.school_id = #{params[:school_id]}") + @courses =Course.joins("join users u on courses.tea_id = u.id").joins("join user_extensions ue on u.id = ue.user_id").where("ue.school_id = #{params[:school_id]}").order("created_at #{@sx_order}") else - @courses = Course.where("0=0") + @courses = Course.where("0=0").order("created_at #{@sx_order}") end if params[:status] && params[:status]!='' - @courses =@courses.where(:is_end =>status) + @courses =@courses.where(:is_end =>status).order("created_at #{@sx_order}") end if "u_name" == keyword if search.blank? - @courses = @courses + @courses = @courses.order("created_at #{@sx_order}") else user_id = User.where("concat(lastname, firstname) like '%#{search}%'") - @courses = @courses.joins("join users u on courses.tea_id = u.id").where("concat(u.lastname, u.firstname) like '%#{search}%'") + @courses = @courses.joins("join users u on courses.tea_id = u.id").where("concat(u.lastname, u.firstname) like '%#{search}%'").order("created_at #{@sx_order}") end else - @courses= @courses.where("name like '%#{search}%'") + @courses= @courses.where("name like '%#{search}%'").order("created_at #{@sx_order}") end @courses = @courses.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").reorder("updatetime desc") @courses_count = @courses.count diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb index b6e34a185..ef053bb16 100644 --- a/app/controllers/school_controller.rb +++ b/app/controllers/school_controller.rb @@ -1,285 +1,286 @@ -class SchoolController < ApplicationController - layout 'course_base' - before_filter :require_admin, :only => :upload_logo - - def upload - uploaded_io = params[:logo] - school_id ||= params[:id] - s1 = School.find(school_id) - unless uploaded_io.nil? - File.open(Rails.root.join('public', 'images', 'school', school_id.to_s+'.png'), 'wb') do |file| - file.write(uploaded_io.read) - end - - s1.logo_link = '/images/school/'+school_id.to_s+'.png' - - end - s1.name = params[:name] unless params[:name].blank? - s1.province = params[:province] unless params[:province].blank? - s1.save - redirect_to admin_schools_url(:school_name => params[:school_name]) - end - - def upload_logo - @school = School.find params[:id] - @school_name = params[:school_name] - end - - #获取制定学校开设的课程数 - def course_count school_id - School.find(school_id).courses.count - end - - - def index - - end - - def get_province - @provinces = School.find_by_sql("select distinct province from schools") - - options = "" - - @provinces.each do |p| - options << "" - end - - # 取id取学校名 - # 连接子表: 查询已添加用户的学校 - school = School.select("id, name"). - joins("RIGHT JOIN ( - SELECT DISTINCT school_id - FROM #{UserExtensions.table_name} - WHERE school_id IS NOT NULL) AS sids ON schools.id = sids.school_id"). - where("#{School.table_name}.id IS NOT NULL") - - options_s = "" - school.each do |s| - options_s << "
  • #{s.name}
    • " - end - - res = Hash.new - res[:text] = options - res[:text_s] = options_s - - render :json => res - - - end - - def get_options - @school = School.where("province = ?", params[:province]) - p = params[:province] - ##@school = School.all - options = "" - - @school.each do |s| - #options << "" - options << "
  • #{s.name}
    • " - end - - - render :text => options - - end - - def get_schoollist - @school = School.where("province = ?", params[:province]) - - options = "" - @school.each do |s| - options << "
  • #{s.name}
    • " - end - - render :text => options - end - - def search_school - q = "%#{params[:key_word].strip}%" - - @school = School.where("name LIKE ?", q) - @school = @school.where("province = ?", params[:province]) if (params[:province] != '0' ) - - options = "" - @school.each do |s| - options << "
  • #{s.name}
    • " - end - - options = "
    #{l(:label_school_not_fount)}
    " if options.blank? - - render :text => options - end - - #根据学校名字或者拼音来查询 - def on_search - condition = "#{params[:name].strip}".gsub(" ","") - #将条件截断为汉字和拼音（全汉字 或者 全拼音 或者 汉字和拼音）， - #获取拼音的第一次出现的位置 - chinese = [] - pinyin = [] - condition.scan(/./).each_with_index do |char,index| - if char =~ /[a-zA-Z0-9]/ - pinyin << char - elsif char =~ /\'/ - else - chinese << char - end - end - if(condition == '') - @school = School.reorder('pinyin').page((params[:page].to_i || 1) - 1).per(100) - @school_count = School.count - else - @school = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").reorder('pinyin').page((params[:page].to_i || 1) - 1).per(100) - @school_count = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").count - end - - result = [] - # @school.each do |sc| - # result << {:value=>sc.name,:data=>sc.id} - # end - render :json =>{ :schools => @school,:count=>@school_count}.to_json - end - - #添加学校 - def add_school - @school = School.new - @school.name = params[:name].strip - @school.pinyin = Pinyin.t(params[:name].strip, splitter: '') - @school.save - respond_to do |format| - format.js - end - end - - #申请高校(单位) name:名称 province:省 city:市 address:地址 remarks:备注 - def apply_add_school - - data = {result:0,name:params[:name],school_id:0} - #0 成功 1参数错误 2名称已存在 3.失败 - data[:result] = 0 - - #检验参数 - if params[:name] == "" || params[:province] == "" || params[:city] == "" || params[:address] == "" - data[:result] = 1 - else - school = School.where("name = '#{params[:name]}'").first - if school - data[:result] = 2 - else - school = School.new - school.name = params[:name].strip - school.pinyin = Pinyin.t(params[:name].strip, splitter: '') - school.province = params[:province] - - #status 0未处理 1通过 2拒绝 - applyschool = ApplyAddSchools.new - - #用belongs_to 可以一起存数据库 - applyschool.school = school - applyschool.name = school.name - applyschool.province = params[:province] - applyschool.city = params[:city] - applyschool.address = params[:address] - applyschool.remarks = params[:remarks] - applyschool.user_id = User.current.id - if applyschool.save - data[:school_id] = school.id - user_extention= User.current.extensions - user_extention.school_id = school.id - user_extention.save! - - # 向管理员发送信息 - users = User.where(:admin => 1) - users.each do |user| - AppliedMessage.create(:user_id => user.id, :status => 0, :applied_user_id => User.current.id, :viewed => 0, :applied_id => school.id, :applied_type => "ApplyAddSchools", :name => school.name ) - end - - else - data[:result] = 3 - end - end - end - render :json =>data - end - - def search_repeat_schoolname - status = 0 #没有重复的 - name = params[:name] - - if name - school = School.where("name = '#{name}'").first - - if school - status = 1 #有重复的 - end - end - - - render :json =>status - end - - def edit_apply_name - name = params[:name] || "" - status = -1 - - if name != "" - applyschool = ApplyAddSchools.where("id=?",params[:id]).first - - applyschool.name = name.strip - - if applyschool.school - applyschool.school.name = name - applyschool.school.pinyin = Pinyin.t(name.strip, splitter: '') - applyschool.school.save! - end - applyschool.save! - status = 0 - end - - render :json=>{:status=>status,:id=>params[:id],:name=>name} - end - - def edit_apply_address - address = params[:address] || "" - - status = -1 - - if address != "" - applyschool = ApplyAddSchools.where("id=?",params[:id]).first - applyschool.address = address - applyschool.save! - status = 0 - end - - render :json=>{:status=>status,:id=>params[:id],:address=>address} - end - - def edit_apply_province - province = params[:province] || "" - city = params[:city] || "" - status = -1 - - if(province != "") &&(city != "") - applyschool = ApplyAddSchools.where("id=?",params[:id]).first - applyschool.province = province - applyschool.city = city - - if applyschool.school - applyschool.school.province = province - applyschool.school.save! - end - applyschool.save! - - if applyschool.user_id && applyschool.user_id != 0 - user = User.find(applyschool.user_id) - user_extention= user.extensions - user_extention.location = province - user_extention.location_city = city - user_extention.save! - end - status = 0 - end - - render :json=>{:status=>status,:id=>params[:id],:province=>province,:city=>city} - end -end +class SchoolController < ApplicationController + layout 'course_base' + before_filter :require_admin, :only => :upload_logo + + def upload + uploaded_io = params[:logo] + school_id ||= params[:id] + s1 = School.find(school_id) + unless uploaded_io.nil? + File.open(Rails.root.join('public', 'images', 'school', school_id.to_s+'.png'), 'wb') do |file| + file.write(uploaded_io.read) + end + + s1.logo_link = '/images/school/'+school_id.to_s+'.png' + + end + s1.name = params[:name] unless params[:name].blank? + s1.province = params[:province] unless params[:province].blank? + s1.save + redirect_to departments_part_managements_path + end + + def upload_logo + @school = School.find params[:id] + @school_name = params[:school_name] + render :layout => "base_management" + end + + #获取制定学校开设的课程数 + def course_count school_id + School.find(school_id).courses.count + end + + + def index + + end + + def get_province + @provinces = School.find_by_sql("select distinct province from schools") + + options = "" + + @provinces.each do |p| + options << "" + end + + # 取id取学校名 + # 连接子表: 查询已添加用户的学校 + school = School.select("id, name"). + joins("RIGHT JOIN ( + SELECT DISTINCT school_id + FROM #{UserExtensions.table_name} + WHERE school_id IS NOT NULL) AS sids ON schools.id = sids.school_id"). + where("#{School.table_name}.id IS NOT NULL") + + options_s = "" + school.each do |s| + options_s << "
  • #{s.name}
    • " + end + + res = Hash.new + res[:text] = options + res[:text_s] = options_s + + render :json => res + + + end + + def get_options + @school = School.where("province = ?", params[:province]) + p = params[:province] + ##@school = School.all + options = "" + + @school.each do |s| + #options << "" + options << "
  • #{s.name}
    • " + end + + + render :text => options + + end + + def get_schoollist + @school = School.where("province = ?", params[:province]) + + options = "" + @school.each do |s| + options << "
  • #{s.name}
    • " + end + + render :text => options + end + + def search_school + q = "%#{params[:key_word].strip}%" + + @school = School.where("name LIKE ?", q) + @school = @school.where("province = ?", params[:province]) if (params[:province] != '0' ) + + options = "" + @school.each do |s| + options << "
  • #{s.name}
    • " + end + + options = "
    #{l(:label_school_not_fount)}
    " if options.blank? + + render :text => options + end + + #根据学校名字或者拼音来查询 + def on_search + condition = "#{params[:name].strip}".gsub(" ","") + #将条件截断为汉字和拼音（全汉字 或者 全拼音 或者 汉字和拼音）， + #获取拼音的第一次出现的位置 + chinese = [] + pinyin = [] + condition.scan(/./).each_with_index do |char,index| + if char =~ /[a-zA-Z0-9]/ + pinyin << char + elsif char =~ /\'/ + else + chinese << char + end + end + if(condition == '') + @school = School.reorder('pinyin').page((params[:page].to_i || 1) - 1).per(100) + @school_count = School.count + else + @school = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").reorder('pinyin').page((params[:page].to_i || 1) - 1).per(100) + @school_count = School.where("name like '%#{chinese.join("")}%' and pinyin like '%#{pinyin.join("")}%'").count + end + + result = [] + # @school.each do |sc| + # result << {:value=>sc.name,:data=>sc.id} + # end + render :json =>{ :schools => @school,:count=>@school_count}.to_json + end + + #添加学校 + def add_school + @school = School.new + @school.name = params[:name].strip + @school.pinyin = Pinyin.t(params[:name].strip, splitter: '') + @school.save + respond_to do |format| + format.js + end + end + + #申请高校(单位) name:名称 province:省 city:市 address:地址 remarks:备注 + def apply_add_school + + data = {result:0,name:params[:name],school_id:0} + #0 成功 1参数错误 2名称已存在 3.失败 + data[:result] = 0 + + #检验参数 + if params[:name] == "" || params[:province] == "" || params[:city] == "" || params[:address] == "" + data[:result] = 1 + else + school = School.where("name = '#{params[:name]}'").first + if school + data[:result] = 2 + else + school = School.new + school.name = params[:name].strip + school.pinyin = Pinyin.t(params[:name].strip, splitter: '') + school.province = params[:province] + + #status 0未处理 1通过 2拒绝 + applyschool = ApplyAddSchools.new + + #用belongs_to 可以一起存数据库 + applyschool.school = school + applyschool.name = school.name + applyschool.province = params[:province] + applyschool.city = params[:city] + applyschool.address = params[:address] + applyschool.remarks = params[:remarks] + applyschool.user_id = User.current.id + if applyschool.save + data[:school_id] = school.id + user_extention= User.current.extensions + user_extention.school_id = school.id + user_extention.save! + + # 向管理员发送信息 + users = User.where(:admin => 1) + users.each do |user| + AppliedMessage.create(:user_id => user.id, :status => 0, :applied_user_id => User.current.id, :viewed => 0, :applied_id => school.id, :applied_type => "ApplyAddSchools", :name => school.name ) + end + + else + data[:result] = 3 + end + end + end + render :json =>data + end + + def search_repeat_schoolname + status = 0 #没有重复的 + name = params[:name] + + if name + school = School.where("name = '#{name}'").first + + if school + status = 1 #有重复的 + end + end + + + render :json =>status + end + + def edit_apply_name + name = params[:name] || "" + status = -1 + + if name != "" + applyschool = ApplyAddSchools.where("id=?",params[:id]).first + + applyschool.name = name.strip + + if applyschool.school + applyschool.school.name = name + applyschool.school.pinyin = Pinyin.t(name.strip, splitter: '') + applyschool.school.save! + end + applyschool.save! + status = 0 + end + + render :json=>{:status=>status,:id=>params[:id],:name=>name} + end + + def edit_apply_address + address = params[:address] || "" + + status = -1 + + if address != "" + applyschool = ApplyAddSchools.where("id=?",params[:id]).first + applyschool.address = address + applyschool.save! + status = 0 + end + + render :json=>{:status=>status,:id=>params[:id],:address=>address} + end + + def edit_apply_province + province = params[:province] || "" + city = params[:city] || "" + status = -1 + + if(province != "") &&(city != "") + applyschool = ApplyAddSchools.where("id=?",params[:id]).first + applyschool.province = province + applyschool.city = city + + if applyschool.school + applyschool.school.province = province + applyschool.school.save! + end + applyschool.save! + + if applyschool.user_id && applyschool.user_id != 0 + user = User.find(applyschool.user_id) + user_extention= user.extensions + user_extention.location = province + user_extention.location_city = city + user_extention.save! + end + status = 0 + end + + render :json=>{:status=>status,:id=>params[:id],:province=>province,:city=>city} + end +end diff --git a/app/views/layouts/base_management.html.erb b/app/views/layouts/base_management.html.erb index a4c7823d7..db8f7b39b 100644 --- a/app/views/layouts/base_management.html.erb +++ b/app/views/layouts/base_management.html.erb @@ -96,8 +96,13 @@
  • <%= link_to '课程实训发布', subject_authorization_managements_path %>
    • -
  • 工程认证+
    • -
  • 其它
    • +
  • 工程认证+
    • +
  • 其它 + +
    • <%= render_flash_messages %> <%= yield %> diff --git a/app/views/managements/_applicable_course_list.html.erb b/app/views/managements/_applicable_course_list.html.erb new file mode 100644 index 000000000..b69b84f6e --- /dev/null +++ b/app/views/managements/_applicable_course_list.html.erb @@ -0,0 +1,23 @@ + + + + + + + + + + + + <% @majorcourse.each_with_index do |majorcourse,index|%> + + + + + + + <% end %> + +
    序号课程名称专业名称创建时间操作
    <%= majorcourse.course_list_id%>
    + + diff --git a/app/views/managements/_classroom_classment_list.html.erb b/app/views/managements/_classroom_classment_list.html.erb index ed9231566..88c237bfb 100644 --- a/app/views/managements/_classroom_classment_list.html.erb +++ b/app/views/managements/_classroom_classment_list.html.erb @@ -12,7 +12,7 @@ 状态 创建者单位 创建者 - 动态时间 + 创建时间 color-light-green ml5" title="功能完善中，敬请期待"> 首页显示 @@ -20,7 +20,7 @@ <% @courses.each do |course| %> <%= course.id %> - <%= link_to(course.name, course_path(course.id)) %> + <%= link_to course.name, school_on_search_path(course.name) %> <%= course.members.count %> <%= course.attachments.count %> <%= course.homework_commons.count%> @@ -47,3 +47,14 @@
    + diff --git a/app/views/managements/_classroom_list.html.erb b/app/views/managements/_classroom_list.html.erb index 8564e12e4..87142cd4c 100644 --- a/app/views/managements/_classroom_list.html.erb +++ b/app/views/managements/_classroom_list.html.erb @@ -8,7 +8,7 @@ 专业名称 课程名称 创建者 - 创建于 + 创建时间 color-light-green ml5"> 课堂模版 @@ -22,7 +22,7 @@ <%= syllabus.syllabus_major == "" ? "--" : syllabus.syllabus_major %> <%= render :partial => 'admin/rename_syllabus_title', :locals => {:syllabus => syllabus} %> <%= link_to syllabus.user.show_name, user_path(syllabus.user) %> - <%= format_time(syllabus.created_at) %> + <%= format_time syllabus.created_at %> @@ -39,3 +39,14 @@
    + diff --git a/app/views/managements/_departments_list.html.erb b/app/views/managements/_departments_list.html.erb index 35c5fba7c..4bad86986 100644 --- a/app/views/managements/_departments_list.html.erb +++ b/app/views/managements/_departments_list.html.erb @@ -13,7 +13,7 @@ <% @department.each do |department| %> <%=department.id %> - <%=department.name %> + <%= department.name %> <%= UserExtensions.where(:department_id => department.id).count %> 3 <%= format_time department.created_at %> diff --git a/app/views/managements/_profession_list.html.erb b/app/views/managements/_profession_list.html.erb new file mode 100644 index 000000000..982cf6263 --- /dev/null +++ b/app/views/managements/_profession_list.html.erb @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + <% @syllabus.each do |syllabus| %> + + + + + + + + + + <% end %> + +
    序号层级学科门类一级学科专业名称创建时间操作
    <%= syllabus.id %><%= syllabus.syllabus_major_level == '' ? "--" : syllabus.syllabus_major_level %><%= syllabus.syllabus_discipline_category == '' ? "--" : syllabus.syllabus_discipline_category %><%= syllabus.syllabus_first_level_discipline == "" ? "--" : syllabus.syllabus_first_level_discipline %><%= syllabus.syllabus_major == "" ? "--" : syllabus.syllabus_major %> <%= format_time syllabus.created_at %> + + +
    + +
    +
    +
      + <%= pagination_links_full @syllabus_pages, @syllabus_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %> +
    +
    +
    +
    + diff --git a/app/views/managements/_unit_list.html.erb b/app/views/managements/_unit_list.html.erb index a98edb7d4..c4d9ac58e 100644 --- a/app/views/managements/_unit_list.html.erb +++ b/app/views/managements/_unit_list.html.erb @@ -14,7 +14,7 @@ <% @apply_status.each do |apply| %> <%= apply.id %> - <%= apply.name %>     + <%= link_to apply.name,school_index_path(apply.id)%> <%= (apply.province.nil? ? "" : apply.province) + (apply.city.nil? ? "" : apply.city) %> diff --git a/app/views/managements/applicable_course.html.erb b/app/views/managements/applicable_course.html.erb new file mode 100644 index 000000000..a7c481ab2 --- /dev/null +++ b/app/views/managements/applicable_course.html.erb @@ -0,0 +1,17 @@ +<%= form_tag(url_for(applicable_course_managements_path),:id=>"classroom",:method => "post",:remote=>true) do %> +
    + + 搜索 + 清除 + 新增实训适用课程 +
    +<% end %> +
    + <%= render :partial => "managements/applicable_course_list" %> +
    + \ No newline at end of file diff --git a/app/views/managements/classroom.html.erb b/app/views/managements/classroom.html.erb index bdbd11dd8..7c89e95f8 100644 --- a/app/views/managements/classroom.html.erb +++ b/app/views/managements/classroom.html.erb @@ -4,13 +4,13 @@ <%= select_tag :discipline_category_id,options_for_select(discipline_category_option, nil), {:id=>"discipline_category_id", :class=>"fl task-form-15 task-height-30", :style => "margin:0px 30px 0px 50px;"} %> <%= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option, nil), {:id=>"first_level_discipline_id", :class=>"fl task-form-20 task-height-30", :style => "margin:0px 30px 0px 25px;"} %> <%= select_tag :major_id,options_for_select(syllabus_major_option, nil), {:id=>"major_id", :class=>"fl task-form-20 task-height-30", :style => "margin:0px 30px 0px 25px;"} %> - <%= @schools.each do |school|%> <% end%> - @@ -18,11 +18,24 @@     - + 搜索 - 清除 + 清除 <% end %>
    <%= render :partial => "managements/classroom_list" %> -
    \ No newline at end of file + + + \ No newline at end of file diff --git a/app/views/managements/classroom_classment.html.erb b/app/views/managements/classroom_classment.html.erb index 1d1dbb815..1793a5420 100644 --- a/app/views/managements/classroom_classment.html.erb +++ b/app/views/managements/classroom_classment.html.erb @@ -18,7 +18,7 @@ 搜索 清除 - + @@ -33,5 +33,6 @@ $("#part").val(""); $("#condition_status").val("uname") $("#Look_name").val(""); + $.get('<%=classroom_classment_managements_path() %>') } \ No newline at end of file diff --git a/app/views/managements/depart.html.erb b/app/views/managements/depart.html.erb index f2cd9251b..2636fe896 100644 --- a/app/views/managements/depart.html.erb +++ b/app/views/managements/depart.html.erb @@ -1,37 +1,16 @@ <%= form_tag(url_for(depart_managements_path), :id => "depart_search", :method => "post", :remote => true ) do %>
    - + 搜索 - 清除 - - - - - - - - - - - - - - - - - - - - - - - - - - - + 清除
    <% end%>
    <%= render :partial => "managements/depart_list" %>
    + diff --git a/app/views/managements/departments.html.erb b/app/views/managements/departments.html.erb index 24562720e..13a1ec82d 100644 --- a/app/views/managements/departments.html.erb +++ b/app/views/managements/departments.html.erb @@ -2,38 +2,16 @@
    搜索 - 清除 + 清除 创建 - -
    <% end %>
    <%= render :partial => "managements/departments_list" %> -
    \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/managements/departments_part.html.erb b/app/views/managements/departments_part.html.erb index b26407a55..c99c8d82f 100644 --- a/app/views/managements/departments_part.html.erb +++ b/app/views/managements/departments_part.html.erb @@ -1,39 +1,17 @@ <%= form_tag(url_for(departments_part_managements_path),:id=>"department_part_search",:method => "post",:remote=>true) do %>
    - + 搜索 - 清除 + 清除 新建单位 - -
    <% end %>
    <%= render :partial => "managements/departments_part_list" %> -
    \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/managements/profession.html.erb b/app/views/managements/profession.html.erb new file mode 100644 index 000000000..51e6d12af --- /dev/null +++ b/app/views/managements/profession.html.erb @@ -0,0 +1,26 @@ +<%= form_tag(url_for(profession_managements_path),:id=>"profession",:method => "post",:remote=>true) do %> +
    + <%= select_tag :major_level,options_for_select(major_level_option, 0), {:id=>"major_level", :class=>"fl task-form-15 task-height-30", :style => "margin:0px 10px 0px 25px;"} %> + <%= select_tag :discipline_category_id,options_for_select(discipline_category_option, nil), {:id=>"discipline_category_id", :class=>"fl task-form-15 task-height-30", :style => "margin:0px 30px 0px 50px;"} %> + <%= select_tag :first_level_discipline_id,options_for_select(first_level_discipline_option, nil), {:id=>"first_level_discipline_id", :class=>"fl task-form-20 task-height-30", :style => "margin:0px 30px 0px 25px;"} %> + 搜索 + 清除 + 新增 +
    + + + + +<% end %> +
    + <%= render :partial => "managements/profession_list" %> +
    + + \ No newline at end of file diff --git a/app/views/managements/profession.js.erb b/app/views/managements/profession.js.erb new file mode 100644 index 000000000..fd11acbcc --- /dev/null +++ b/app/views/managements/profession.js.erb @@ -0,0 +1 @@ +$("#classroom_list").html("<%= j(render :partial => "managements/profession_list") %>"); \ No newline at end of file diff --git a/app/views/managements/unit.html.erb b/app/views/managements/unit.html.erb index 0320255a9..2b0968bb3 100644 --- a/app/views/managements/unit.html.erb +++ b/app/views/managements/unit.html.erb @@ -2,10 +2,15 @@
    搜索 - 清除 + 清除
    <% end%>
    <%= render :partial => "managements/unit_list" %>
    - + diff --git a/app/views/school/upload_logo.html.erb b/app/views/school/upload_logo.html.erb index 3a61eedd5..11e23c22c 100644 --- a/app/views/school/upload_logo.html.erb +++ b/app/views/school/upload_logo.html.erb @@ -1,76 +1,76 @@ - - -<%= form_tag(upload_school_path(@school.id),method: "post", multipart: true,:id => "school_form") do %> - <%#= text_field_tag 'school'%> -
    - - <%= image_tag(@school.logo_link, id: "avatar_image", :class=>"school_avatar")%> - 上传图片 - <%= file_field_tag 'logo',:style => "display:none;", :id => "file", :onchange => "showPreview(this)"%> -
    -
    学校名称：
    -
    学校省份： - -
    -
    - - - <%#= submit_tag('提交',:class=>'mr5') %> - <%#= submit_tag('取消') %> -
    -
    -<% end %> - - + + +<%= form_tag(upload_school_path(@school.id),method: "post", multipart: true,:id => "school_form") do %> + <%#= text_field_tag 'school'%> +
    + + <%= image_tag(@school.logo_link, id: "avatar_image", :class=>"school_avatar")%> + 上传图片 + <%= file_field_tag 'logo',:style => "display:none;", :id => "file", :onchange => "showPreview(this)"%> +
    +
    学校名称：
    +
    学校省份： + +
    +
    + + + <%#= submit_tag('提交',:class=>'mr5') %> + <%#= submit_tag('取消') %> +
    +
    +<% end %> + + diff --git a/config/routes.rb b/config/routes.rb index 2bfb6f1f9..275207c83 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -148,6 +148,8 @@ RedmineApp::Application.routes.draw do resources :managements do collection do + match 'applicable_course',:via=>[:get,:post] + match 'profession',:via=>[:get,:post] match 'shixuns', :via => [:get, :post] match 'publish_shixuns', :via => [:get, :post] match 'close_shixuns', :via => [:get, :post] diff --git a/public/stylesheets/css/edu-admin.css b/public/stylesheets/css/edu-admin.css index 647d621fb..046686f3b 100644 --- a/public/stylesheets/css/edu-admin.css +++ b/public/stylesheets/css/edu-admin.css @@ -91,7 +91,7 @@ a.edu-ad-user{ } /* 试用授权用户列表 17/06/05 bylinda*/ .edu-admin-nav{ width:100%; background:#fff; height: 50px; } -.edu-admin-nav-li{ width:8.3%; text-align: center; border-bottom:3px solid #fff; height:47px; line-height:47px;} +.edu-admin-nav-li{ width:8.1%; text-align: center; border-bottom:3px solid #fff; height:47px; line-height:47px;} .edu-admin-nav-li:hover,.edu-admin-nav-li.active{border-bottom:3px solid #5faee3;} a.edu-admin-nav-a{ display: block; height: 24px; border-right:1px solid #ddd; line-height:24px; margin-top:13px; color:#333;} a:hover.edu-admin-nav-a,.active a.edu-admin-nav-a{color: #5faee3;}