From 946755f9e09278d1c2dc5b8c891931e9cdea57cb Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 3 Apr 2019 18:03:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/cooperates_controller.rb      |  4 +-
 app/models/school.rb                          |  4 +
 .../_partner_item.html.erb}                   | 33 ++++---
 app/views/cooperates/partner_list.html.erb    | 42 +++++++++
 app/views/cooperates/partner_list.js.erb      |  2 +
 app/views/managements/users_list.html.erb     | 86 -------------------
 config/routes.rb                              | 10 +++
 7 files changed, 75 insertions(+), 106 deletions(-)
 rename app/views/{managements/_users_list.html.erb => cooperates/_partner_item.html.erb} (54%)
 create mode 100644 app/views/cooperates/partner_list.js.erb
 delete mode 100644 app/views/managements/users_list.html.erb

diff --git a/app/controllers/cooperates_controller.rb b/app/controllers/cooperates_controller.rb
index 1f43fcaa..09895193 100644
--- a/app/controllers/cooperates_controller.rb
+++ b/app/controllers/cooperates_controller.rb
@@ -2,11 +2,11 @@ class CooperatesController < ApplicationController
 
   def partner_list
     search = params[:search]
-    @schools = School.where(id: [179, 3181, 3216]).where("name like ?", "'%#{search}%'")
+    @schools = School.where(id: [117, 179, 3181, 3216])
     @all_count = @schools.size
 
     unless search.blank?
-      @schools = @schools.where("name like ?", "'%#{search}%'")
+      @schools = @schools.where("name like ?", "%#{search}%")
     end
     @search_count = @schools.size
     @schools = paginateHelper @schools, 15
diff --git a/app/models/school.rb b/app/models/school.rb
index 2d69bf00..98158c5d 100644
--- a/app/models/school.rb
+++ b/app/models/school.rb
@@ -58,4 +58,8 @@ class School < ActiveRecord::Base
                              myshixun_id !=0").first.try(:sw_count)
   end
 
+  def statistic_url
+    dep = departments.where("identifier is not null").first
+    url = dep.present? ? "/colleges/#{dep.identifier}/statistics" : ""
+  end
 end
diff --git a/app/views/managements/_users_list.html.erb b/app/views/cooperates/_partner_item.html.erb
similarity index 54%
rename from app/views/managements/_users_list.html.erb
rename to app/views/cooperates/_partner_item.html.erb
index 993c6db3..a094c452 100644
--- a/app/views/managements/_users_list.html.erb
+++ b/app/views/cooperates/_partner_item.html.erb
@@ -9,29 +9,26 @@
   <span class="column-2 fr">使用详情</span>
 </p>
 <ul class="minH-560 edu-back-white pb20 courselist">
+  <% @schools.each_with_index do |school, index| %>
     <li class="clearfix bor-bottom-greyE" id="major_list">
-      <span class="column-No major_index">1</span>
-      <span class="column-2">国防科技大学</span>
-      <span class="column-2">22</span>
-      <span class="column-2">
-        33
-      </span>
-      <span class="column-2">
-        44
-      </span>
-      <span class="column-2">
-        55
-      </span>
-      <span class="column-2">
-        66
-      </span>
+      <span class="column-No major_index"><%= index + 1 %></span>
+      <span class="column-2"><%= school.name %></span>
+      <span class="column-2"><%= school.teacher_count %></span>
+      <span class="column-2"><%= school.student_count %></span>
+      <span class="column-2"><%= school.course_count %></span>
+      <span class="column-2"><%= school.shixun_count %></span>
+      <span class="column-2"><%= school.shixun_report_count %></span>
       <span class="column-2 fr">
-          <a href="" class="color-blue">查看</a>
+        <% if school.statistic_url != "" %>
+          <a href="<%= school.statistic_url %>" target="_blank" class="color-blue">查看</a>
+        <% else %>
+        --
+        <% end %>
       </span>
     </li>
-
-
+  <% end %>
 </ul>
+
 <div class="educontent edu-txt-center mb80 mt20">
   <div class="inline pages_user_show">
     <ul>
diff --git a/app/views/cooperates/partner_list.html.erb b/app/views/cooperates/partner_list.html.erb
index e69de29b..40b581b3 100644
--- a/app/views/cooperates/partner_list.html.erb
+++ b/app/views/cooperates/partner_list.html.erb
@@ -0,0 +1,42 @@
+<div id="Auth_main">
+  <div class="educontent mb30 mt20">
+
+    <div class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
+        <span class="fl font-12 mt5">
+          <span class="color-orange-tip mr3" id="search_partner_count"><%= @obj_count %></span>
+          <span class="color-grey-9">个检索结果（<span id="all_major_count"><%= @all_count %></span> 单位）</span>
+        </span>
+      <div class="fr" id="pollingPanel">
+        <input type="text" name="search" maxlength="20" placeholder="请输入单位名称搜索" />
+        <a href="javascript:void(0)" onclick="submit_search_major()"><i class="iconfont icon-sousuo font-16 color-grey-9"></i></a>
+      </div>
+    </div>
+
+    <div class="ListTableLine ListTableLines" id="partner_school_list">
+      <%= render :partial => "partner_item" %>
+    </div>
+  </div>
+
+</div>
+
+<script>
+    $(function(){
+
+        $("#pollingPanel").on("keydown", "input[name='search']", function(e){
+            // 兼容FF和IE和Opera
+            var theEvent = e || window.event;
+            var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+            if (code == 13) {
+                //回车执行查询
+                submit_search_major()
+            }
+        });
+    });
+
+
+    function submit_search_major(){
+        $.get('/cooperates/partner_list',
+            { search: $("input[name='search']").val().trim()});
+    }
+
+</script>
\ No newline at end of file
diff --git a/app/views/cooperates/partner_list.js.erb b/app/views/cooperates/partner_list.js.erb
new file mode 100644
index 00000000..7b44c9df
--- /dev/null
+++ b/app/views/cooperates/partner_list.js.erb
@@ -0,0 +1,2 @@
+$("#partner_school_list").html("<%= j(render :partial => "partner_item") %>");
+$("#search_partner_count").html("<%= @obj_count %>");
\ No newline at end of file
diff --git a/app/views/managements/users_list.html.erb b/app/views/managements/users_list.html.erb
deleted file mode 100644
index f990cca8..00000000
--- a/app/views/managements/users_list.html.erb
+++ /dev/null
@@ -1,86 +0,0 @@
-<div id="Auth_main">
-  <div class="educontent clearfix edu-back-white bor-bottom-greyE">
-    <div class="padding20-30">
-<!--      <p class="mb20"><span class="font-18 mr20">管理员</span><span class="font-12 color-grey-9"></span></p>-->
-<!--      <ul class="clearfix managerPanels">-->
-
-<!--          <a class="fl relative">-->
-<!--            <img alt="头像" class="radius" height="48" src="https://www.educoder.net/images/avatars/User/6?1543479003" width="48" />-->
-<!--            <i class="iconfont icon-shanchudiao userimg color-grey-9" ></i>-->
-<!--            <span class="color-black">达达老师</span>-->
-<!--          </a>-->
-
-<!--          <a class="fl relative">-->
-<!--            <i class="iconfont icon-tianjiafangda useradd color-grey-9"></i>-->
-<!--          </a>-->
-
-<!--      </ul>-->
-
-<!--      <ul  class="clearfix managerPanels">-->
-<!--        <a class="fl font-16 padding5-20 block mr30 navItem active color-blue"><span class="fl">实训回复</span></a>-->
-<!--      </ul>-->
-
-    </div>
-
-  </div>
-
-
-
-
-  <div class="educontent mb30">
-
-    <div class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
-        <span class="fl font-12 mt5">
-          <span class="color-orange-tip mr3" id="search_major_count"><%= @obj_count %></span>
-          <span class="color-grey-9">个检索结果（<span id="all_major_count"><%= @major_count %></span> 单位）</span>
-        </span>
-        <div class="fr" id="pollingPanel">
-          <input type="text" name="search" placeholder="请输入单位名称搜索" />
-          <a href="javascript:void(0)" onclick="submit_search_major()"><i class="iconfont icon-sousuo font-16 color-grey-9"></i></a>
-        </div>
-    </div>
-
-    <div class="ListTableLine ListTableLines" id="school_major_list">
-        <%= render :partial => "department_list" %>
-    </div>
-  </div>
-
-</div>
-
-<script>
-    $(function(){
-
-        $(".MajorName i").click(function(){
-            $(this).parents(".MajorName").remove();
-        });
-
-        $("#school_major_list").on("click", ".addMajorManager", function(){
-            if($("#major_managers_"+$(this).attr("data-major-id")).children("span").length < 5){
-                var html="<%= escape_javascript(render :partial => "ecs/authList_addUnit") %>";
-                pop_box_new(html,572,500);
-                $("#object_id").val($(this).attr("data-major-id"));
-                $("#object_type").val('major');
-                $("input[name='school']").val('<%= @school.name %>');
-            } else {
-                notice_box("只能配置5个专业管理员");
-            }
-        });
-
-        $("#pollingPanel").on("keydown", "input[name='search']", function(e){
-            // 兼容FF和IE和Opera
-            var theEvent = e || window.event;
-            var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
-            if (code == 13) {
-                //回车执行查询
-                submit_search_major()
-            }
-        });
-    });
-
-
-        function submit_search_major(){
-            $.get('/ecs/department?school_id=<%= @school.id %>',
-                 { search: $("input[name='search']").val().trim()});
-        }
-
-</script>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index d600fc11..1df8d0d6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -40,6 +40,16 @@ RedmineApp::Application.routes.draw do ## oauth相关
   post 'ecloud/ps_update', to: 'ecloud#ps_update'
 
 
+  resources :cooperates do
+    member do
+
+    end
+
+    collection do
+      get 'partner_list'
+    end
+  end
+
   resources :ec_course_evaluations do
     member do
       match 'import_score', :via => [:post]