From 9f417e17cdf93f8b76bbacf707a1ed1837ba7ac1 Mon Sep 17 00:00:00 2001
From: jasder <jasder@jasderdeMacBook-Pro.local>
Date: Thu, 4 Apr 2019 11:28:01 +0800
Subject: [PATCH] FIX UI

---
 app/controllers/managements_controller.rb     | 36 ++++++++++++++++++-
 app/controllers/partners_controller.rb        | 29 +++++++++++++++
 app/models/partner.rb                         |  5 ++-
 .../managements/_partner_addManage.html.erb   | 19 ++++++++--
 app/views/managements/partners.html.erb       | 33 ++++++++++++-----
 config/routes.rb                              |  1 +
 6 files changed, 110 insertions(+), 13 deletions(-)
 create mode 100644 app/controllers/partners_controller.rb

diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index dc1d39e3..290c2bd7 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -1175,6 +1175,24 @@ end
     @menu_type = 6
     @sub_type = 3
     @partners = Partner.includes(:school).order("created_at desc")
+
+    @current_partner = nil
+    if params[:partner]
+      @current_partner =  @partners.find params[:partner]
+    else
+      @current_partner =  @partners[0] if @partners.size > 0
+    end
+
+    @partners.each do |part|
+      if part.id == @current_partner.id
+        part.active = "active"
+      end
+    end
+  end
+
+  def get_partner
+    @partner = Partner.find partner
+
   end
 
   def all_partners
@@ -1219,7 +1237,7 @@ end
         school.save
       end
       render :json => {status: 1, message: "创建成功!"}
-      redirects_to partners_path
+      redirect_to partners_path
     end
   end
 
@@ -1252,6 +1270,13 @@ end
         @department.department_members << DepartmentMember.new(:user_id => member)
       end
     end
+    redirect_to partners_managments_path
+
+    # respond_to do |format|
+    #   format.html {render :layout => "base_edu"}
+    #   format.js
+    # end
+
   end
 
   # 添加合作伙伴管理员- 弹框
@@ -1266,8 +1291,17 @@ end
     @members = paginateHelper @members, 8
   end
 
+  # 合作伙伴添加管理员
   def add_partner_member
+    if params[:partner] && params[:partner_member]
+      @partner = Partner.find_by_id params[:partner]
+      params[:partner_member].each do |member|
+        user = User.find_by_id member
+        user.update_attributes(partner_id: @partner.id) if !@partner.nil? && !user.nil?
+      end
+    end
 
+    redirects_to
   end
 
   # check 部门 identifier是否重复
diff --git a/app/controllers/partners_controller.rb b/app/controllers/partners_controller.rb
new file mode 100644
index 00000000..214948cf
--- /dev/null
+++ b/app/controllers/partners_controller.rb
@@ -0,0 +1,29 @@
+class PartnersController < ApplicationController
+  layout 'base_management'
+
+  def index
+    @menu_type = 6
+    @sub_type = 3
+
+    @partners = Partner.includes(:school)
+  end
+
+  def new
+
+  end
+
+  def edit
+
+  end
+
+  def create
+
+  end
+
+  def destroy
+
+  end
+
+  private
+
+end
diff --git a/app/models/partner.rb b/app/models/partner.rb
index e838e464..217bc1a7 100644
--- a/app/models/partner.rb
+++ b/app/models/partner.rb
@@ -1,5 +1,8 @@
 class Partner < ActiveRecord::Base
-  attr_accessible :name
+  # attr_accessible :name, :active
+  attr_accessor :active
+
   has_one :school
   has_many :customers
+  has_many :users
 end
diff --git a/app/views/managements/_partner_addManage.html.erb b/app/views/managements/_partner_addManage.html.erb
index 94e3ba0b..e6de3cec 100644
--- a/app/views/managements/_partner_addManage.html.erb
+++ b/app/views/managements/_partner_addManage.html.erb
@@ -14,7 +14,8 @@
       </p>
       <div class="edu-back-skyblue clearfix pl10 over280" id="serch_user_list">
 
-        <%= form_for "", :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">
           <% @members.each do |member| %>
             <p class="clearfix">
               <span class="fl edu-txt-w90">
@@ -31,7 +32,7 @@
 
       </div>
     </div>
-    <p class="color-orange-tip" id="form_notice"></p>
+    <p class="clearfix none color-red edu-txt-left" id="form_notice">请至少选择一个用户</p>
     <li class="clearfix mt10 edu-txt-center">
       <a href="javascript:void(0);" class="task-btn mr10" onclick="hideModal()">取消</a>
       <a href="javascript:void(0);" class="task-btn task-btn-orange ml20" onclick="submit_add_manager()">确定</a>
@@ -39,6 +40,17 @@
   </div>
 </div>
 <script>
+
+    function submit_add_manager(){
+        if($("input[name='partner_member[]']:checked").length == 0){
+            $("#form_notice").show();
+        } else {
+            $("#form_notice").hide();
+            $("#add_partner_member_form").submit();
+            hideModal();
+        }
+    }
+
     $(function() {
         unitDownOption();
 
@@ -58,5 +70,8 @@
                 return;
             }
         }
+
+
+
     })
 </script>
\ No newline at end of file
diff --git a/app/views/managements/partners.html.erb b/app/views/managements/partners.html.erb
index cf16ead1..40c3cbf4 100644
--- a/app/views/managements/partners.html.erb
+++ b/app/views/managements/partners.html.erb
@@ -9,7 +9,9 @@
       <a href="javascript:void(0)" class="color-blue addOperation">+添加</a>
       <ul class="partnerList">
         <% @partners.each_with_index do |partner,index| %>
-          <li><a class="active" href=""><%= partner.name %></a></li>
+          <li>
+            <%= link_to "#{partner.name}", partners_managements_path(:partner => partner), :class => "#{partner.active}" %>
+          </li>
         <% end %>
       </ul>
     </div>
@@ -22,9 +24,19 @@
               <span class="mr45 color-grey-9 fl">管理员</span>
               <ul class="manageList">
                 <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), :remote => true, :class => "addManage" %>
                 </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>
+
+                <% unless @current_partner.nil? %>
+                  <% @current_partner.users.each_with_index do |user, index| %>
+                    <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>
             </div>
           </div>
@@ -35,16 +47,19 @@
               <span><a href="javascript:void(0)" class="color-blue">+添加</a></span>
               <span>添加时间</span>
             </li>
-            <li>
-              <span>1</span>
-              <span class="task-hide">国防科技大学</span>
-              <span>
+            <% @current_partner.customers.each do |customer| %>
+              <li>
+                <span><%= customer.school.id %></span>
+                <span class="task-hide"><%= customer.school.name %></span>
+                <span>
                 <a href="javascript:void(0)" class="color-grey-9">删除</a>
               </span>
-              <span>
+                <span>
                 2019-04-03 16:04
               </span>
-            </li>
+              </li>
+            <% end %>
+
           </div>
         </div>
       </div>
diff --git a/config/routes.rb b/config/routes.rb
index efc9756e..2b826b52 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -556,6 +556,7 @@ RedmineApp::Application.routes.draw do ## oauth相关
       get 'partners'
       get 'add_partner_member_box'
       post 'add_partner_member'
+      get 'get_partner'
       get 'all_partners'
       post 'add_partner'
       delete 'delete_depart_member'