From a8ed5ebb63a26c6d3217083ee4f50cb77484f301 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sun, 25 Sep 2016 14:35:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=89=80=E6=9C=89=E4=BA=BA=E4=B8=8E?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BA=A6=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/queries_helper.rb   |  4 +++-
 app/views/issues/index.html.erb | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index dc962b8b0..4a8306920 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -255,16 +255,18 @@ module QueriesHelper
       # Give it a name, required to be valid
       @query = IssueQuery.new(:name => "_")
       @query.project = @project
-      params[:f] = %w(subject tracker_id status_id priority_id assigned_to_id fixed_version_id created_on) unless params[:status_id].nil?
+      params[:f] = %w(subject tracker_id status_id priority_id done_ratio assigned_to_id fixed_version_id created_on) unless params[:status_id].nil?
       params[:op] = {'subject' => "~" ,
                      'status_id' => ( params[:status_id] == '0' ? "!":"=" ),
                      'priority_id' => ( params[:priority_id] == '0' ? "!":"=" ),
+                     'done_ratio' => ( params[:done_ratio] == '0' ? "!":"=" ),
                     'tracker_id' => ( params[:tracker_id] == '0' ? "!":"=" ),
                     'fixed_version_id' => ( params[:fixed_version_id] == '0' ? "!":"=" ),
                     'assigned_to_id' => ( params[:assigned_to_id] == '0' ? "!":"=" )} unless params[:status_id].nil?
       params[:v] = {'subject' => [params[:subject]],
                     'status_id' => [params[:status_id]],
                     'priority_id' => [params[:priority_id]],
+                    'done_ratio' => [params[:done_ratio]],
                     'tracker_id' => [params[:tracker_id]],
                     'fixed_version_id' => [params[:fixed_version_id]],
                     'assigned_to_id' => [params[:assigned_to_id]]} unless params[:status_id].nil?
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 8c02bf348..7d7c5f460 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -121,7 +121,7 @@
 
             <div class="issues_con_list" style="position: relative;">
               <ul id="issues_list_nav" >
-                <li id="issues_list_nav_1" class="issues_nav_hover" onclick="HoverLi(1);">
+                <li id="issues_list_nav_1" class="issues_nav_hover" onclick="HoverLi(1);nh_reset_form();">
                   <a href="javascript:void(0);" onclick="all_reset_form();" id="issues_type_1" >所有<span class="issues_nav_tag ml5"><%= @project.project_score.issue_num %></span></a>
                 </li>
                 <li id="issues_list_nav_2" onclick="HoverLi(2);">
@@ -138,25 +138,33 @@
                   <%= select( :issue, :user_id, principals_options_for_isuue_list(@project),
                               { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0
                               },
-                              {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"w90 mr18"}
+                              {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"fl"}
                       )
                   %>
                   <%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]),
                               { :include_blank => false,:selected=>@priority_id ?  @priority_id : 0
                               },
-                              {:onchange=>"remote_function();",:id=>"priority_id",:name=>"priority_id",:class=>"w90 mr18"}
+                              {:onchange=>"remote_function();",:id=>"priority_id",:name=>"priority_id",:class=>"fl"}
                       )
                   %>
+
+                  <%#= select(:issue, :done_ratio, [["10%",1],["20%",2],["30%",3],["40%",4],["50%",5],["60%",6],["70%",7],["80%",8],["90%",9],["100%",10]].unshift(["完成度",0]),
+                             {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0 },
+                             {:onchange => "remote_function();", :id => "done_ratio", :name => "done_ratio", :class => "f1"}) %>
+                  <%= select( :issue,:done_ratio, ((1..10).to_a.collect { |r| ["#{r*10} %", r*10] }).unshift(["完成度",0]),
+                              {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0},
+                              {:onchange=>"remote_function();",:id=>"done_ratio",:name=>"done_ratio",:class=>"fl"}) %>
+
                   <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
                               { :include_blank => false,:selected=>@status_id ? @status_id : 0
                               },
-                              {:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"w90 mr18"}
+                              {:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"fl"}
                       )
                   %>
 
                   <%= select(:issue, :tracker, [["缺陷",1],["功能",2],["支持",3],["任务",4],["周报",5]].unshift(["类型",0]),
                              {:include_blank => false, :selected => @tracker_id ? @tracker_id : 0},
-                             {:onchange => "remote_function();", :id => "tracker_id", :name => "tracker_id", :class => "fl issues_filter_select_min"}) %>
+                             {:onchange => "remote_function();", :id => "tracker_id", :name => "tracker_id", :class => "fl"}) %>
 
                   <%= select(:issue, :fixed_version, options_for_version_isuue_list(@project),
                              {:include_blank => false, :selected => @fixed_version_id ? @fixed_version_id : 0},