From 405b362470bf2daf4c9e653feb5da015684e78e5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 7 Feb 2018 16:01:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=90=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E4=B8=8E=E6=95=B0=E6=8D=AE=E4=B8=BB=E7=B1=BB=E5=88=AB=E7=9A=84?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/statistics_controller.rb      | 13 ++++++
 app/views/statistics/_form.html.erb           | 42 +++++++++++--------
 app/views/statistics/index.html.erb           | 23 +++-------
 config/routes.rb                              |  6 ++-
 ...180207065530_add_catogory_to_statistics.rb |  6 +++
 db/schema.rb                                  | 10 +++--
 6 files changed, 60 insertions(+), 40 deletions(-)
 create mode 100644 db/migrate/20180207065530_add_catogory_to_statistics.rb

diff --git a/app/controllers/statistics_controller.rb b/app/controllers/statistics_controller.rb
index b7fd0b8c0..00cca9816 100644
--- a/app/controllers/statistics_controller.rb
+++ b/app/controllers/statistics_controller.rb
@@ -2,6 +2,7 @@ class StatisticsController < ApplicationController
   # GET /statistics
   # GET /statistics.json
   layout 'base_statistic'
+  before_filter :get_date, :only => [:index, :new, :edit]
 
   def index
     @statistics = Statistic.all
@@ -82,4 +83,16 @@ class StatisticsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  def get_sub_category
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  private
+  def get_date
+    @main_categories = MainCategory.all
+    @sub_categories = params[:main_category_id].present? ? SubCategory.where(:main_category_id => params[:main_category_id]) : SubCategory.all
+  end
 end
diff --git a/app/views/statistics/_form.html.erb b/app/views/statistics/_form.html.erb
index 8b65ed2bc..4106aa5a2 100644
--- a/app/views/statistics/_form.html.erb
+++ b/app/views/statistics/_form.html.erb
@@ -18,25 +18,22 @@
       </div>
       <div class="field line_field">
         <label><span>*</span>数据分类：</label>
+        <%= f.select :main_category_id, (@main_categories.collect { |mc| [mc.name, mc.id] }),
+                   {:no_label => true}, :onchange => "get_sub_category(this.options[this.options.selectedIndex].value)",
+                    :class => "w150" %>
         <%#= f.text_field :description %>
-        <div class="fl pr wb20 change_sort">
-          <input type="text" placeholder="请选择分类" class="wb100 c_sort_input"  id="parent_down"/><span class="down"></span>
-          <ul class="c_sort_list">
-            <li>开发数据1</li>
-            <li>开发数据2</li>
-            <li>开发数据3</li>
-            <li>开发数据4</li>
-          </ul>
-        </div>
-        <div class="fl pr wb20 ml20 change_sort">
-          <input type="text" placeholder="请选择子类" class="wb100 c_sort_input"  id="child_down"/><span class="down"></span>
-          <ul class="c_sort_list">
-            <li>开发数据1</li>
-            <li>开发数据2</li>
-            <li>开发数据3</li>
-            <li>开发数据4</li>
-          </ul>
-        </div>
+        <!--<div class="fl pr wb20 change_sort">-->
+          <!--<input type="text" placeholder="请选择主类别" class="wb100 c_sort_input"  id="parent_down"/><span class="down"></span>-->
+          <!--<ul class="c_sort_list">-->
+
+          <!--</ul>-->
+        <!--</div>-->
+        <!--<div class="fl pr wb20 ml20 change_sort">-->
+          <!--<input type="text" placeholder="请选择子类" class="wb100 c_sort_input"  id="child_down"/><span class="down"></span>-->
+          <!--<ul class="c_sort_list">-->
+
+          <!--</ul>-->
+        <!--</div>-->
       </div>
       <div class="field line_field">
         <label>数据描述：</label>
@@ -70,6 +67,15 @@
 </div>
 
 <script>
+    //  获取子类别
+    function get_sub_category(id) {
+        alert(id);
+        $.ajax({
+            url: <%= get_sub_category_statistics_path %>,
+            type: 'get',
+            data: {main_category_id: id}
+        });
+    }
   //删除标签
   function tag_del(item){
       $(item).parents(".tag_span").remove();
diff --git a/app/views/statistics/index.html.erb b/app/views/statistics/index.html.erb
index 9389a57f5..d2cff8adf 100644
--- a/app/views/statistics/index.html.erb
+++ b/app/views/statistics/index.html.erb
@@ -4,29 +4,18 @@
     <span class="fl data_name">数据类型</span>
     <div class="fl data_line">
       <span class="active">不限</span>
-      <span>开发数据</span>
-      <span>发布数据</span>
-      <span>应用数据</span>
-      <span>发布数据</span>
-      <span>开发数据</span>
-      <span>发布数据</span>
-      <span>应用数据</span>
-      <span>发布数据</span>
-      <span>开发数据</span>
-      <span>应用数据</span>
+      <% @main_categories.each do |mc| %>
+          <span><%= mc.name %></span>
+      <% end %>
     </div>
   </div>
   <div class="data_half cl">
     <span class="fl data_name">子类型</span>
     <div class="fl data_line">
       <span class="active">不限</span>
-      <span>开发数据</span>
-      <span>发布数据</span>
-      <span>应用数据</span>
-      <span>发布数据</span>
-      <span>开发数据</span>
-      <span>发布数据</span>
-      <span>应用数据</span>
+      <% @sub_categories.each do |mc| %>
+          <span><%= mc.name %></span>
+      <% end %>
     </div>
   </div>
   <div class="data_half cl">
diff --git a/config/routes.rb b/config/routes.rb
index 117ca0a8d..6afb84f0c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,7 +32,11 @@ RedmineApp::Application.routes.draw do
   resources :main_categories
 
 
-  resources :statistics
+  resources :statistics do
+    collection do
+      get 'get_sub_category'
+    end
+  end
 
 
   mount Mobile::API => '/api'
diff --git a/db/migrate/20180207065530_add_catogory_to_statistics.rb b/db/migrate/20180207065530_add_catogory_to_statistics.rb
new file mode 100644
index 000000000..5af775e60
--- /dev/null
+++ b/db/migrate/20180207065530_add_catogory_to_statistics.rb
@@ -0,0 +1,6 @@
+class AddCatogoryToStatistics < ActiveRecord::Migration
+  def change
+    add_column :statistics, :main_category_id, :integer
+    add_column :statistics, :sub_category_id, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5093608f2..074bff04e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20180207030237) do
+ActiveRecord::Schema.define(:version => 20180207065530) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -2642,9 +2642,11 @@ ActiveRecord::Schema.define(:version => 20180207030237) do
     t.string   "name"
     t.text     "description"
     t.integer  "user_id"
-    t.integer  "status",      :limit => 1, :default => 0
-    t.datetime "created_at",                              :null => false
-    t.datetime "updated_at",                              :null => false
+    t.integer  "status",           :limit => 1, :default => 0
+    t.datetime "created_at",                                   :null => false
+    t.datetime "updated_at",                                   :null => false
+    t.integer  "main_category_id"
+    t.integer  "sub_category_id"
   end
 
   create_table "student_work_projects", :force => true do |t|