Merge branch 'master' into 'master'

Master

I add search function and fix some translation error

See merge request !1

app/controllers/personal_patents_controller.rb

@@ -1,4 +1,9 @@
 class PersonalPatentsController < ApplicationController
+  def search_all_words(target,word)
+    target=target.upcase
+    words=word.upcase.split(' ')
+    return words.select{|value| target.include? value}==words
+  end
   def index
     params = OrbitHelper.params
     patents = Patent.where(:is_hidden=>false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count)
@@ -12,6 +17,32 @@ class PersonalPatentsController < ApplicationController
         "authors"
       ]
     end 
+    if params[:selectbox] !=nil
+      patents_temp = Patent.where(:is_hidden=>false).sort_by{ |tp| [-tp[:year].to_i,-tp[:publication_date].to_i] }
+      case params[:selectbox]
+      when "patent_title","default"
+          patents_show = patents_temp.select {|value| search_all_words((value.patent_title rescue ""), params[:keywords])}
+      when "publish_date", "application_date", "end_date"
+          patents_show = patents_temp.select {|value| search_all_words((value.send(params[:selectbox]).strftime("%Y/%m/%d") rescue ""), params[:keywords])}
+      when "patent_category"
+          patents_show = patents_temp.select {|value| search_all_words((value.patent_types.collect{|pt| pt.title}.join(", ").to_s rescue ""), params[:keywords])}
+      when "author_type"
+          patents_show = patents_temp.select {|value| search_all_words(value.patent_author_types.collect{|pt| pt.title}.join(", "), params[:keywords])}
+      when "language"
+          patents_show = patents_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])}
+      else
+          patents_show = patents_temp.select {|value| search_all_words((value.send(params[:selectbox]).to_s rescue ""), params[:keywords])}
+      end
+      if params[:page_no].nil?
+          page_to_show = 1
+      else
+          page_to_show = params[:page_no].to_i
+      end
+      patents = patents_show[(page_to_show-1)*OrbitHelper.page_data_count...page_to_show*OrbitHelper.page_data_count]
+      patents_total_pages = (patents_show.length/OrbitHelper.page_data_count.to_f).ceil
+    else
+      patents_total_pages = patents.total_pages
+    end
     patent_list = []
     patents.each do |patent|
       t = []
@@ -29,14 +60,16 @@ class PersonalPatentsController < ApplicationController
             t << {"value" => (patent.patent_types.collect{|pt| pt.title}.join(", ") rescue "")}
           when "author_type"
             t << {"value" => (patent.patent_author_types.collect{|pt| pt.title}.join(", ") rescue "")}
+          when "language"
+            t << {"value" => (!patent.language.nil? ? t("#{patent.language}") : "")}
           else
             t << {"value" => patent.send(fs)}
         end
       end
       patent_list << {"patent_list" => t}
     end
-
+    choice_show = []
-     headers = []
+    headers = []
     fields_to_show.each do |fs|
       col = 2
       col = 3 if fs == "patent_title"
@@ -45,12 +78,30 @@ class PersonalPatentsController < ApplicationController
         "head-title" => header,
         "col" => col
       }
+      choice_show << header
     end
+    choice_value = fields_to_show
+    choice_value.unshift("default")
+    choice_select=choice_value.map{|iter| iter==params[:selectbox] ? "selected" : ""}
+    choice_select=choice_select.map{|value| {"choice_select" => value}}
+    choice_value=choice_value.map{|value| {"choice_value" => value}}
+    choice_default = params[:locale]!='en' ? "——選取分類——" : "——select class——"
+    choice_show.unshift(choice_default)
+    choice_show=choice_show.map{|value| {"choice_show" => value}}
+    choice=choice_value.zip(choice_show,choice_select)
+    choice=choice.map{|value| value.inject:merge}
+    select_text = params[:locale]!='en' ? "搜尋類別:" : "search class:"
+    search_text = params[:locale]!='en' ? "關鍵字搜尋:" : "word to search:"
     {
       "patents" => patent_list,
-      "extras" => { "widget-title" => t("module_name.personal_patent") },
+      "extras" => { "widget-title" => t("module_name.personal_patent"), 
+                    "url" => "/"+params[:locale]+params[:url], 
+                    "select_text" => select_text, 
+                    "search_text" => search_text,
+                    "search_value" => params[:keywords] },
       "headers" => headers,
-      "total_pages" => patents.total_pages
+      "total_pages" => patents_total_pages,
+      "choice" => choice
     }
   end
 

app/views/admin/patents/_form.html.erb

@@ -212,7 +212,7 @@
       <div class="control-group">
         <label class="control-label muted"><%= t("personal_patent.publication_date") %></label>
         <div class="controls">
-          <%= f.datetime_picker :publish_date, :no_label => true, :format=>"yyyy/MM", :value => @patent.publish_date, :new_record => @patent.new_record? %>
+          <%= f.datetime_picker :publish_date, :no_label => true, :format=>"yyyy/MM/dd", :value => @patent.publish_date, :new_record => @patent.new_record? %>
         </div>
       </div>
 
@@ -220,7 +220,7 @@
       <div class="control-group">
         <label class="control-label muted"><%= t("personal_patent.application_date") %></label>
         <div class="controls">
-          <%= f.datetime_picker :application_date, :no_label => true, :format=>"yyyy/MM", :value => @patent.application_date, :new_record => @patent.new_record? %>
+          <%= f.datetime_picker :application_date, :no_label => true, :format=>"yyyy/MM/dd", :value => @patent.application_date, :new_record => @patent.new_record? %>
         </div>
       </div>
 
@@ -228,7 +228,7 @@
       <div class="control-group">
         <label class="control-label muted"><%= t("personal_patent.end_date") %></label>
         <div class="controls">
-          <%= f.datetime_picker :end_date, :no_label => true, :format=>"yyyy/MM", :value => @patent.end_date, :new_record => @patent.new_record? %>
+          <%= f.datetime_picker :end_date, :no_label => true, :format=>"yyyy/MM/dd", :value => @patent.end_date, :new_record => @patent.new_record? %>
         </div>
       </div>
 

app/views/admin/patents/_patent.html.erb

@@ -1,6 +1,6 @@
 <% @patents.each do |patent| %> 
   <tr id="<%= dom_id patent %>" class="<%= patent.is_hidden ? "checkHide" : "" %>">
-    <td><%= patent.publish_date.strftime("%Y.%m") rescue "" %></td>
+    <td><%= patent.publish_date.strftime("%Y.%m.%d") rescue "" %></td>
     <td>
       <%= link_to patent.patent_title, OrbitHelper.url_to_plugin_show(patent.to_param,'personal_patent').to_s, target: "blank"%>
       <div class="quick-edit">

app/views/admin/patents/excel_format.xlsx.axlsx

@@ -65,7 +65,7 @@ wb.add_worksheet(name: "Patents") do |sheet|
 
   row << t("personal_patent.publication_date")
   row1 << "date"
-  row2 << "Format: YYYY/MM, Example: 2015/12"
+  row2 << "Format: YYYY/MM/DD, Example: 2015/12/31"
 
   row << t("personal_patent.url")
   row1 << "textfield"

app/views/plugin/personal_patent/_profile.html.erb

@@ -43,7 +43,7 @@
             <%= check_box_tag 'to_change[]', patent.id.to_s, false, :class => "list-check" %>
           </td>
         <% end %>
-        <td><%= (patent.publish_date.strftime("%Y.%m") rescue "") %></td>
+        <td><%= (patent.publish_date.strftime("%Y.%m.%d") rescue "") %></td>
         <td>
           <%= link_to patent.patent_title, OrbitHelper.url_to_plugin_show(patent.to_param,'personal_patent').to_s, target: "blank"%>
           <div class="quick-edit">