Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun
commit
d847282684
@ -0,0 +1,6 @@
|
||||
|
||||
function show_add_manager(id) {
|
||||
$(".auth-schools-user-add").modal("show");
|
||||
|
||||
$(".auth-schools-user-add").find("#school_id_input").val(id)
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
$(document).on('turbolinks:load', function() {
|
||||
if ($('body.admins-major-informations-index-page').length > 0) {
|
||||
var box_contain = $(".major-informations-list-container");
|
||||
box_contain.on("click",".collapse-item",function () {
|
||||
var a_fa = $(this).find("i");
|
||||
if(a_fa.hasClass("fa-caret-right")){
|
||||
a_fa.removeClass("fa-caret-right").addClass("fa-caret-down");
|
||||
}else{
|
||||
a_fa.removeClass("fa-caret-down").addClass("fa-caret-right");
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
@ -0,0 +1,66 @@
|
||||
.admins-auth-schools-index-page{
|
||||
.list-item-title{
|
||||
padding-bottom:5px;
|
||||
padding-left: 33px;
|
||||
color: #555;
|
||||
}
|
||||
.list-item-title-1{
|
||||
width: 100px;
|
||||
display: inline-block;
|
||||
}
|
||||
.list-item-title-2{
|
||||
width: 200px;
|
||||
display: inline-block;
|
||||
}
|
||||
.collegeManage{
|
||||
float: left;
|
||||
padding: 0px 8px;
|
||||
border-radius: 6px;
|
||||
background-color: #f5f5f5;
|
||||
margin: 3px 0px 3px 10px;
|
||||
height: 34px;
|
||||
line-height: 34px;
|
||||
a{
|
||||
color: #05101a;
|
||||
}
|
||||
a:hover{
|
||||
color: #007bff;
|
||||
}
|
||||
}
|
||||
i:hover{
|
||||
color: #333;
|
||||
}
|
||||
.add-manager-i{
|
||||
float: left;
|
||||
i{
|
||||
padding: 10px 5px;
|
||||
}
|
||||
}
|
||||
.auth-schools-new-add, .auth-schools-user-add{
|
||||
.flex-column{
|
||||
input{
|
||||
height: 38px;
|
||||
}
|
||||
}
|
||||
.search-school{
|
||||
margin-left: 15px;
|
||||
}
|
||||
|
||||
}
|
||||
.school-search-list{
|
||||
background: #F4FAFF;
|
||||
height: 280px;
|
||||
overflow-y: scroll;
|
||||
padding: 10px 0;
|
||||
}
|
||||
.school-list-item{
|
||||
padding: 2px 10px;
|
||||
input{
|
||||
font-size: 20px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
.admins-major-informations-index-page{
|
||||
.fr{
|
||||
float:right;
|
||||
}
|
||||
.panel-default{
|
||||
margin-bottom: 10px;
|
||||
background-color: rgb(245, 245, 245);
|
||||
.panel-heading{
|
||||
i{
|
||||
margin-right:15px;
|
||||
font-size:16px;
|
||||
color:rgb(204, 204, 204);
|
||||
}
|
||||
a{
|
||||
padding: 8px 10px;
|
||||
display: inline-block;
|
||||
width:100%;
|
||||
color:rgb(102, 102, 102);
|
||||
}
|
||||
}
|
||||
.panel-collapse{
|
||||
padding-top: 10px;
|
||||
background: #fff;
|
||||
table{
|
||||
text-align:center;
|
||||
th,td{
|
||||
padding: 8px;
|
||||
}
|
||||
td{
|
||||
color:#888;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
class Admins::AuthSchoolsController < Admins::BaseController
|
||||
|
||||
def index
|
||||
schools = School.where(ec_auth: 1).includes(:users).order("updated_at desc")
|
||||
@params_page = params[:page] || 1
|
||||
@schools = paginate schools
|
||||
end
|
||||
|
||||
def destroy
|
||||
ActiveRecord::Base.transaction do
|
||||
school = School.where(id: params[:id]).first
|
||||
school.destroy
|
||||
end
|
||||
end
|
||||
|
||||
# 工程认证单位列表搜索学校
|
||||
def search_school
|
||||
@schools = School.where("ec_auth != 1 and name like '%#{params[:name]}%'").limit(10)
|
||||
end
|
||||
|
||||
# 添加认证学校
|
||||
def add_school
|
||||
all_schools = School.all
|
||||
all_schools.where(id: params[:school_id]).update_all(ec_auth: 1)
|
||||
schools = all_schools.where(ec_auth: 1).order("updated_at desc")
|
||||
@params_page = params[:page] || 1
|
||||
@schools = paginate schools
|
||||
end
|
||||
|
||||
# 搜索用户
|
||||
def search_manager
|
||||
school = School.find_by(id: params[:school_id])
|
||||
user_ids = school&.ec_school_users&.pluck(:user_id)
|
||||
@users = User.where.not(id: user_ids).where("concat(lastname, firstname) like ?", "%#{params[:name].strip.to_s}%").limit(10)
|
||||
end
|
||||
|
||||
# 添加认证学校管理员
|
||||
def add_manager
|
||||
ActiveRecord::Base.transaction do
|
||||
user_ids = params[:user_id]
|
||||
@school_id = params[:school_id]
|
||||
user_ids.each do |id|
|
||||
EcSchoolUser.create(user_id: id, school_id: @school_id)
|
||||
end
|
||||
@school_users = User.where(id: user_ids)
|
||||
end
|
||||
end
|
||||
|
||||
# 删除学校管理员
|
||||
def remove_manager
|
||||
ActiveRecord::Base.transaction do
|
||||
manager = EcSchoolUser.where(school_id: params[:school_id], user_id: params[:user_id]).first
|
||||
manager&.destroy
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
@ -0,0 +1,8 @@
|
||||
class Admins::MajorInformationsController < Admins::BaseController
|
||||
|
||||
def index
|
||||
disciplines = EcDiscipline.includes(ec_discipline_firsts: {ec_majors: :schools}).order("ec_disciplines.code asc")
|
||||
@disciplines = paginate disciplines
|
||||
end
|
||||
|
||||
end
|
||||
@ -0,0 +1,12 @@
|
||||
class EcDiscipline < ActiveRecord::Base
|
||||
validates_presence_of :code, :name
|
||||
|
||||
has_many :ec_discipline_firsts
|
||||
|
||||
# 专业数目
|
||||
def major_count
|
||||
count = 0
|
||||
self.ec_discipline_firsts.map{|f| count += f.ec_majors.count}
|
||||
count
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,6 @@
|
||||
class EcDisciplineFirst < ActiveRecord::Base
|
||||
validates_presence_of :code, :name
|
||||
|
||||
has_many :ec_majors
|
||||
belongs_to :ec_discipline
|
||||
end
|
||||
@ -1,7 +1,10 @@
|
||||
class EcMajor < ApplicationRecord
|
||||
# 主页对应的学校，不同学校可以选用同样的专业，而每个专业又各具特色
|
||||
has_many :schools, through: :ec_major_schools
|
||||
has_many :ec_major_schools, dependent: :destroy
|
||||
has_many :schools, through: :ec_major_schools
|
||||
|
||||
# 一级专业
|
||||
belongs_to :ec_discipline_first
|
||||
|
||||
scope :search_name_or_code, -> (keyword) { where('name LIKE :keyword OR code LIKE :keyword', keyword: "%#{keyword.strip}%") }
|
||||
end
|
||||
|
||||
@ -0,0 +1,6 @@
|
||||
if($(".auth-schools-user-add").length > 0){
|
||||
$(".auth-schools-user-add").modal("hide")
|
||||
}
|
||||
<% if @school_users.size > 0 %>
|
||||
$("#table-school-<%= @school_id %>").find(".school_user_list").html("<%= j render partial: "admins/auth_schools/shared/school_user_list", locals: {users: @school_users, school_id: @school_id} %> ")
|
||||
<% end %>
|
||||
@ -0,0 +1,2 @@
|
||||
$(".auth-schools-list-container").html("<%= j render partial: "admins/auth_schools/shared/list", locals: {schools: @schools} %>")
|
||||
$(".auth-schools-new-add").modal("hide")
|
||||
@ -0,0 +1 @@
|
||||
$("#table-school-<%= params[:id] %>").remove()
|
||||
@ -0,0 +1,14 @@
|
||||
<% define_admin_breadcrumbs do %>
|
||||
<% add_admin_breadcrumb('认证单位列表') %>
|
||||
<% end %>
|
||||
|
||||
<div class="box search-form-container auth-schools-list-form">
|
||||
<%= javascript_void_link '新增', class: 'btn btn-primary', data: { toggle: 'modal', target: '.auth-schools-new-add' } %>
|
||||
</div>
|
||||
|
||||
<div class="box auth-schools-list-container">
|
||||
<%= render(partial: 'admins/auth_schools/shared/list', locals: { schools: @schools }) %>
|
||||
</div>
|
||||
|
||||
<%= render partial: "admins/auth_schools/shared/new_modal" %>
|
||||
<%= render partial: "admins/auth_schools/shared/user_add_modal" %>
|
||||
@ -0,0 +1 @@
|
||||
$(".auth-schools-list-container").html("<%= j render partial: "admins/auth_schools/shared/list", locals: {schools: @schools} %>")
|
||||
@ -0,0 +1,2 @@
|
||||
|
||||
$("#table-school-<%= params[:school_id] %>").find("#manager-<%= params[:user_id] %>").remove()
|
||||
@ -0,0 +1,4 @@
|
||||
|
||||
if($("#add-users-list").length > 0){
|
||||
$("#add-users-list").html("<%= j render partial: "admins/auth_schools/shared/add_users_list", locals: {users: @users, school_id: params[:school_id]} %>")
|
||||
}
|
||||
@ -0,0 +1,3 @@
|
||||
if($("#add-schools-list").length > 0){
|
||||
$("#add-schools-list").html("<%= j render partial: "admins/auth_schools/shared/add_schools_list", locals: {schools: @schools} %>")
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
|
||||
<%= form_tag(add_school_admins_auth_schools_path, method: :post, remote: true) do %>
|
||||
<div class="add-school-list-item">
|
||||
<div class="list-item-title">单位名称</div>
|
||||
<div class="school-search-list">
|
||||
<% if schools.size > 0 %>
|
||||
<% schools.each do |school| %>
|
||||
<div class="school-list-item">
|
||||
<%= check_box_tag("school_id[]", school.id, false, id: "check_school_#{school.id}") %>
|
||||
<label for="check_school_<%= school.id %>">
|
||||
<%= school.try(:name) %>
|
||||
</label>
|
||||
</div>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<p class="padding10-5 color-grey-c">没有相关的单位</p>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-right mt10">
|
||||
<%= submit_tag("确认",class: "btn btn-primary submit-btn") %>
|
||||
</div>
|
||||
<% end %>
|
||||
@ -0,0 +1,31 @@
|
||||
<%= form_tag(add_manager_admins_auth_schools_path, method: :post, remote: true) do %>
|
||||
<%= hidden_field_tag("school_id",school_id) %>
|
||||
<div class="add-school-list-item">
|
||||
<div class="list-item-title">
|
||||
<span class="list-item-title-1">姓名</span>
|
||||
<span class="list-item-title-2">单位</span>
|
||||
</div>
|
||||
<div class="school-search-list">
|
||||
<% if users.size > 0 %>
|
||||
<% users.each do |user| %>
|
||||
<div class="school-list-item">
|
||||
<%= check_box_tag("user_id[]", user.id, false, id: "check_user_#{user.id}") %>
|
||||
<label for="check_user_<%= user.id %>">
|
||||
<span class="list-item-title-1">
|
||||
<%= user.try(:show_real_name) %>
|
||||
</span>
|
||||
<span class="list-item-title-2">
|
||||
<%= user.try(:school_name) %>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<p class="padding10-5 color-grey-c">没有相关的单位</p>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-right mt10">
|
||||
<%= submit_tag("确认",class: "btn btn-primary submit-btn") %>
|
||||
</div>
|
||||
<% end %>
|
||||
@ -0,0 +1,38 @@
|
||||
|
||||
<table class="table" cellspacing="0" cellpadding="0">
|
||||
<thead>
|
||||
<th width="10%">序号</th>
|
||||
<th width="30%">学校名称</th>
|
||||
<th width="50%">学校管理员</th>
|
||||
<th width="10%">操作</th>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% if schools.size > 0 %>
|
||||
<% schools.each_with_index do |school, index| %>
|
||||
<tr id="table-school-<%= school.id %>">
|
||||
<td><%= list_index_no(@params_page.to_i, index) %></td>
|
||||
<td>
|
||||
<%= link_to "#{school.name}", "/ecs/department?school_id=#{school.id}", target: "_blank" %>
|
||||
</td>
|
||||
<td>
|
||||
<div class="add-manager-i">
|
||||
<%= link_to "<i class='fa fa-plus-circle font-18 color-grey-c'></i>".html_safe, "javascript:void(0)", class: "action", onclick: "show_add_manager('#{school.id}')" %>
|
||||
</div>
|
||||
<div class="inline-block school_user_list">
|
||||
<% if school.users.size > 0 %>
|
||||
<%= render partial: "admins/auth_schools/shared/school_user_list", locals: {users: school.users, school_id: school.id} %>
|
||||
<% end %>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<%= link_to "<i class='fa fa-trash-o color-grey-c font-18 padding10-5'></i>".html_safe, admins_auth_school_path(school), method: :delete, data: {confirm: "确认删除吗？"}, remote: true %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<%= render 'admins/shared/no_data_for_table' %>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<%= render partial: 'admins/shared/paginate', locals: { objects: schools } %>
|
||||
@ -0,0 +1,32 @@
|
||||
<div class="modal fade auth-schools-new-add" tabindex="-1" role="dialog" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-centered" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">新增认证单位</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<%= form_tag(search_school_admins_auth_schools_path,method: :get ,remote: true) do %>
|
||||
<div class="form-group d-flex mbt10">
|
||||
<div class="w-75 d-flex flex-column">
|
||||
<%= text_field_tag(:name, nil, class: 'form-control', placeholder: '请输入单位名称搜索') %>
|
||||
</div>
|
||||
<%= submit_tag("搜索",class:"btn btn-primary search-school", 'data-disable-with': "搜索中...") %>
|
||||
</div>
|
||||
<% end %>
|
||||
<div id="add-schools-list">
|
||||
<div class="add-school-list-item">
|
||||
<div class="list-item-title">单位名称</div>
|
||||
<div class="school-search-list">
|
||||
<div class="school-list-item">
|
||||
<span class="color-grey-c">请输入单位名称</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -0,0 +1,36 @@
|
||||
<div class="modal fade auth-schools-user-add" tabindex="-1" role="dialog" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-centered" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">添加管理员</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<%= form_tag(search_manager_admins_auth_schools_path, method: :get ,remote: true) do %>
|
||||
<%= hidden_field("school_id","",id:"school_id_input") %>
|
||||
<div class="form-group d-flex mbt10">
|
||||
<div class="w-75 d-flex flex-column">
|
||||
<%= text_field_tag(:name, nil, class: 'form-control', placeholder: '请输入用户姓名搜索') %>
|
||||
</div>
|
||||
<%= submit_tag("搜索",class:"btn btn-primary search-school", 'data-disable-with': "搜索中...") %>
|
||||
</div>
|
||||
<% end %>
|
||||
<div id="add-users-list">
|
||||
<div class="add-school-list-item">
|
||||
<div class="list-item-title">
|
||||
<span class="list-item-title-1">姓名</span>
|
||||
<span class="list-item-title-2">单位</span>
|
||||
</div>
|
||||
<div class="school-search-list">
|
||||
<div class="school-list-item">
|
||||
<span class="color-grey-c">请输入用户姓名搜索</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -0,0 +1,7 @@
|
||||
<% define_admin_breadcrumbs do %>
|
||||
<% add_admin_breadcrumb('本科专业目录') %>
|
||||
<% end %>
|
||||
|
||||
<div class="box major-informations-list-container">
|
||||
<%= render(partial: 'admins/major_informations/shared/list', locals: { majors: @disciplines }) %>
|
||||
</div>
|
||||
@ -0,0 +1,48 @@
|
||||
<div class="panel-group" id="accordion">
|
||||
<% if @disciplines.size > 0 %>
|
||||
<% @disciplines.each_with_index do |d,index| %>
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<div class="panel-title">
|
||||
<a data-toggle="collapse" data-parent="#accordion"
|
||||
href="#collapse-<%= index %>" class="collapse-item">
|
||||
<i class="fa fa-caret-right fa-fw"></i>
|
||||
<span><%= "#{d.code} #{d.name}" %></span>
|
||||
<span class="fr"><%= d.major_count %></span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div id="collapse-<%= index %>" class="panel-collapse collapse in">
|
||||
<div class="panel-body">
|
||||
<table class="table table-bordered" cellpadding="0" cellspacing="0">
|
||||
<thead>
|
||||
<th class="with20">一级学科代码</th>
|
||||
<th class="with20">一级学科名称</th>
|
||||
<th class="with20">专业代码</th>
|
||||
<th class="with20">专业名称</th>
|
||||
<th class="with20">认证学校数量</th>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% d.ec_discipline_firsts.each do |f| %>
|
||||
<% f.ec_majors.each_with_index do |m, index| %>
|
||||
<tr>
|
||||
<td><%= index == 0 ? f.code : "" %></td>
|
||||
<td><%= index == 0 ? f.name : "" %></td>
|
||||
<td><%= m.code %></td>
|
||||
<td><%= m.name %></td>
|
||||
<td><%= m.schools.size.to_i %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<%= render 'admins/shared/no_data_for_table' %>
|
||||
<% end %>
|
||||
</div>
|
||||
<%= render partial: 'admins/shared/paginate', locals: { objects: @disciplines } %>
|
||||
Loading…
Reference in new issue