Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners

Browse Source
dev_local
daiao 6 years ago
parent c18c99c7a7 770538f16f
commit 72e8056d7b
10 changed files with 113 additions and 85 deletions
Show Stats Download Patch File Download Diff File

36
app/controllers/managements_controller.rb
Unescape View File

@ -1290,7 +1290,6 @@ end
school.update_attributes(:partner_id => partner.id) school.update_attributes(:partner_id => partner.id)
end end
end end
render :json => {status: 1, message: "创建成功!"}
end end
end end
@ -1339,13 +1338,17 @@ end
@partner = Partner.where(:id => params[:partner]).first @partner = Partner.where(:id => params[:partner]).first
@members = @members =
if params[:search] if params[:search]
User.where("LOWER(concat(lastname, firstname, nickname, mail)) LIKE '%#{params[:search]}%'") User.where("LOWER(concat(lastname, firstname, nickname, mail)) LIKE '%#{params[:search]}%' AND partner_id is NULL")
else else
User.where(:certification => 1) User.where(:certification => 1, :partner_id => nil )
end end
@members = paginateHelper @members, 8 @total_pages = (@members.count / 10.0).ceil
@members = paginateHelper @members, 10
respond_to do |format| respond_to do |format|
format.js format.js
format.json {
render json: member_json_data(@members)
}
end end
end end
@ -1358,10 +1361,18 @@ end
user.update_attributes(partner_id: @partner.id) if !@partner.nil? && !user.nil? user.update_attributes(partner_id: @partner.id) if !@partner.nil? && !user.nil?
end end
end end
end
redirect_to partners_managements_path # 合作伙伴删除管理员
def delete_partner_member
if params[:partner] && params[:partner_member]
@partner = Partner.find_by_id params[:partner]
user = User.find_by_id params[:partner_member]
user.update_attributes(partner_id: nil) if !@partner.nil? && !user.nil?
end
end end
# check 部门 identifier是否重复 # check 部门 identifier是否重复
def check_depart_identifier def check_depart_identifier
logger.info("###############{params}") logger.info("###############{params}")
@ -4380,4 +4391,19 @@ end
book.write xls_report book.write xls_report
xls_report.string xls_report.string
end end
def member_json_data mmebers
mmebers.map do |member|
real_name = member.show_real_name
identity = member.identity
school_name = member.school_name
user_phone = member.phone || ""
member.attributes.dup.except("login", "hashed_password", "salt", "status", "mail", "experience", "grade",
"authentication", "professional_certification").merge({real_name: real_name,
identity: identity,
school_name: school_name,
user_phone: user_phone})
end
end
end end

36
app/views/managements/_partner_addManage.html.erb
Unescape View File

@ -14,7 +14,7 @@
</p> </p>
<%= form_for @partner, :url => add_partner_member_managements_path,:html => {:id => 'add_partner_member_form', :remote => true, :method => :post} do |f| %> <%= form_for @partner, :url => add_partner_member_managements_path,:html => {:id => 'add_partner_member_form', :remote => true, :method => :post} do |f| %>
<input type="hidden" value="<%= @partner.id %>" name="partner"> <input type="hidden" value="<%= @partner.id %>" name="partner">
<div id="serch_user_list"> <div class="edu-back-skyblue clearfix pl10 over280" id="member_search_user_list">
<%= render :partial => "partner_member_search_list" %> <%= render :partial => "partner_member_search_list" %>
</div> </div>
<% end %> <% end %>
@ -27,14 +27,14 @@
</div> </div>
</div> </div>
<script> <script>
var i = 1; //设置当前页数 var member_i = 1; //设置当前页数
var msg_list_loading = false; var msg_list_loading = false;
$(function() { $(function() {
var totalpage = <%= @total_pages.to_i %>; //总页数，防止超过总页数继续滚动 var totalpage = <%= @total_pages.to_i %>; //总页数，防止超过总页数继续滚动
var winH = $(window).height(); //页面可视区域高度 var winH = $(window).height(); //页面可视区域高度
$("#search_user_list").scroll(function() { $("#member_search_user_list").scroll(function() {
if (i < totalpage) { // 当滚动的页数小于总页数的时候，继续加载 if (member_i < totalpage) { // 当滚动的页数小于总页数的时候，继续加载
var pageH = $(document.body).height(); var pageH = $(document.body).height();
var scrollT = $(window).scrollTop(); //滚动条top var scrollT = $(window).scrollTop(); //滚动条top
@ -42,7 +42,7 @@
console.log(aa); console.log(aa);
if ( !msg_list_loading ){ if ( !msg_list_loading ){
if (aa < 0.01 ) { if (aa < 0.01 ) {
get_schools(i+1) get_schools(member_i+1)
} }
} }
} }
@ -50,26 +50,26 @@
}); });
function get_schools(page) { function get_schools(page) {
var msg_list = $('#search_user_list'); var msg_list = $('#member_search_user_list');
if (msg_list.height() + msg_list[0].scrollTop >= msg_list[0].scrollHeight - 60) { if (msg_list.height() + msg_list[0].scrollTop >= msg_list[0].scrollHeight - 60) {
msg_list_loading = true; msg_list_loading = true;
$.getJSON("/managements/add_partner_member_box?partner=<%= @partner.id %>&search="+$("#partner_member_search").val()+"&page="+page, function(schools) { $.getJSON("/managements/add_partner_member_box?partner=<%= @partner.id %>&search="+$("#partner_member_search").val()+"&page="+page, function(members) {
if (schools) { if (members) {
msg_list_loading = false; msg_list_loading = false;
var s_html = ""; var s_html = "";
$.each(schools,function (index,array) { $.each(members,function (index,array) {
s_html = s_html+ "<p class='clearfix mt5'>" + s_html = s_html+ "<p class='clearfix'>" +
" <span class='fl with70'>" + " <span class='fl edu-txt-w90'>" +
" <span>" + " <input type='checkbox' name='partner_member[]' value='"+array["id"]+"' id='user_'"+array["id"]+"'class='magic-checkbox'>" +
" <input type='checkbox' name='school[id]' value='"+array["school"]["id"]+"' id='school_'"+array["school"]["id"]+"'class='magic-checkbox'>" + " <label for='user_'"+array["id"]+">"+array["real_name"]+"</label>" +
" <label for='school_'"+array["school"]["id"]+">"+array["school"]["name"]+"</label>" +
" </span>\n" +
" </span>\n" + " </span>\n" +
" <span class='fl with30'>"+array["school"]["province"]+"</span>" + "<span class='fl edu-txt-w90 mt5 edu-txt-center color-grey-6 pointer'>"+array["identity"]+"</span>" +
"<span class=\"fl task-hide edu-txt-w200 mt5 edu-txt-left color-grey-9\">"+array["school_name"]+"</span>" +
"<span class=\"fl edu-txt-w100 mt5 edu-txt-center color-grey-9\">"+array["user_phone"]+"</span>" +
" </p>" " </p>"
}); });
$("#search_user_list").append(s_html); $("#member_search_user_list").append(s_html);
i ++; member_i ++;
} }
}); });
} }

10
app/views/managements/_partner_member_list.html.erb
Unescape View File

@ -0,0 +1,10 @@
<% partner.users.each do |user| %>
<li>
<%= image_tag(url_to_avatar(user)) %>
<a href="javascript:void(0)" onclick="delete_confirm_box_2('<%= delete_partner_member_managements_path(partner: partner.id,
partner_member: user.id) %>', '确定要删除该管理员吗')" class="removeImg">
<i class="iconfont icon-htmal5icon19 color-grey-9"></i>
</a>
<span class="task-hide managementName">胡莎莎</span>
</li>
<% end %>

6
app/views/managements/_unit_cooperativePartner.html.erb
Unescape View File

@ -24,7 +24,11 @@
<span class="mr45 color-grey-9 fl">管理员</span> <span class="mr45 color-grey-9 fl">管理员</span>
<ul class="manageList"> <ul class="manageList">
<li><a href="javascript:void(0)" class="addManage">+</a></li> <li><a href="javascript:void(0)" class="addManage">+</a></li>
<li><img src="https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=105293018,2500805440&fm=27&gp=0.jpg"/><a href="javascript:void(0)" class="removeImg"><i class="iconfont icon-htmal5icon19 color-grey-9"></i></a></li> <li>
<img src="https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=105293018,2500805440&fm=27&gp=0.jpg"/>
<a href="javascript:void(0)" class="removeImg"><i class="iconfont icon-htmal5icon19 color-grey-9"></i></a>
<span class="task-hide manageName">胡莎莎</span>
</li>
</ul> </ul>
</div> </div>
</div> </div>

1
app/views/managements/add_partner_member.js.erb
Unescape View File

@ -0,0 +1 @@
$("#partner_member_list").html("<%= j(render :partial => "partner_member_list", :locals => {partner: @partner}) %>")

2
app/views/managements/add_partner_member_box.js.erb
Unescape View File

@ -1,5 +1,5 @@
<% if params[:search] %> <% if params[:search] %>
$("#serch_user_list").html("<%= j(render :partial => "partner_member_search_list") %>") $("#member_search_user_list").html("<%= j(render :partial => "partner_member_search_list") %>")
<% else %> <% else %>
var html="<%= escape_javascript(render :partial => "managements/partner_addManage") %>"; var html="<%= escape_javascript(render :partial => "managements/partner_addManage") %>";
pop_box_new(html,572,500); pop_box_new(html,572,500);

1
app/views/managements/delete_partner_member.js.erb
Unescape View File

@ -0,0 +1 @@
$("#partner_member_list").html("<%= j(render :partial => "partner_member_list", :locals => {partner: @partner}) %>")

28
app/views/managements/partners.html.erb
Unescape View File

@ -20,26 +20,16 @@
<div class="edu-back-white"> <div class="edu-back-white">
<div> <div>
<div class="padding10-20"> <div class="padding10-20">
<p class="mb20"> <p class="mb20"><span class="mr30 color-grey-9">添加时间</span><span class="color-grey-6"><%= format_time @current_partner.try(:created_at) %></span></p>
<span class="mr30 color-grey-9">添加时间</span><span class="color-grey-6"><%= format_time @current_partner.try(:created_at) %></span>
</p>
<div class="clearfix"> <div class="clearfix">
<span class="mr45 color-grey-9 fl">管理员</span> <span class="mr45 color-grey-9 fl">管理员</span>
<ul class="manageList"> <ul class="manageList">
<li> <li>
<%= link_to '+', add_partner_member_box_managements_path(:partner => 1), :remote => true, :class => "addManage" %> <%= link_to '+', add_partner_member_box_managements_path(:partner => @current_partner.try(:id)), :remote => true, :class => "addManage" %>
</li> </li>
<div id="partner_member_list" class="fl">
<% unless @current_partner.nil? %> <%= render :partial => "partner_member_list", :locals => {partner: @current_partner} %>
<% @current_partner.users.each_with_index do |user, index| %> </div>
<li>
<%= image_tag(url_to_avatar(user)) %>
<a href="javascript:void(0)" class="removeImg">
<i class="iconfont icon-htmal5icon19 color-grey-9"></i>
</a>
</li>
<% end %>
<% end %>
</ul> </ul>
</div> </div>
</div> </div>
@ -59,7 +49,7 @@
<a href="javascript:void(0)" class="color-grey-9">删除</a> <a href="javascript:void(0)" class="color-grey-9">删除</a>
</span> </span>
<span> <span>
2019-04-03 16:04 <%= format_time customer.created_at %>
</span> </span>
</li> </li>
<% end %> <% end %>
@ -78,11 +68,5 @@
$(".partnerList li a").removeClass("active"); $(".partnerList li a").removeClass("active");
$(this).addClass("active"); $(this).addClass("active");
}) })
$(".removeImg").on("click",function(){
$(this).parents("li").remove();
})
}) })
</script> </script>

1
config/routes.rb
Unescape View File

@ -556,6 +556,7 @@ RedmineApp::Application.routes.draw do ## oauth相关
get 'partners' get 'partners'
get 'add_partner_member_box' get 'add_partner_member_box'
post 'add_partner_member' post 'add_partner_member'
delete 'delete_partner_member'
get 'get_partner' get 'get_partner'
get 'all_partners' get 'all_partners'
post 'add_partner' post 'add_partner'

5
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -2984,9 +2984,10 @@ a.singlepublishtwo{
} }
.partnerList{max-height: 500px;overflow-y: auto;} .partnerList{max-height: 500px;overflow-y: auto;}
.manageList{float: left} .manageList{float: left}
.manageList li{width: 60px;height: 60px;float: left;margin-right: 15px;border-radius: 50%;text-align: center;position: relative;margin-bottom: 10px;} .manageList li{width: 60px;float: left;margin-right: 15px;border-radius: 50%;text-align: center;position: relative;margin-bottom: 10px;}
.manageList li>a.addManage,.manageList li>img{width: 60px;height: 60px;line-height: 49px;float: left;margin-right: 10px;border-radius: 50%;} .manageList li>a.addManage,.manageList li>img{width: 60px;height: 60px;line-height: 49px;margin-right: 10px;border-radius: 50%;display: block}
.addManage{display: block;background: #cdcdcd;color: #fff!important;font-size: 55px;} .addManage{display: block;background: #cdcdcd;color: #fff!important;font-size: 55px;}
.managementName{display: block;width: 60px;color: #666;}
.removeImg{position: absolute;right: 1px;top: -12px;} .removeImg{position: absolute;right: 1px;top: -12px;}
.tableList .tableHead{background: #fafafa} .tableList .tableHead{background: #fafafa}
.tableList{min-height: 400px;} .tableList{min-height: 400px;}

Write Preview
Loading…
Cancel
Save