From 949993f85206a198901080ab195a5f98160548ed Mon Sep 17 00:00:00 2001 From: chiu Date: Fri, 16 Aug 2019 09:27:54 +0800 Subject: [PATCH] Update personal_patents_controller.rb --- .../personal_patents_controller.rb | 57 +++++++++++++++++-- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/app/controllers/personal_patents_controller.rb b/app/controllers/personal_patents_controller.rb index d58c112..81ffac9 100644 --- a/app/controllers/personal_patents_controller.rb +++ b/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" + patent_show = patents_temp.select {|value| search_all_words(value.patent_types.collect{|pt| pt.title}.join(", "), 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 + patentes_show = patents_temp.select {|value| search_all_words(value.send(params[:selectbox]).to_s, 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 = [] @@ -35,8 +66,8 @@ class PersonalPatentsController < ApplicationController end patent_list << {"patent_list" => t} end - - headers = [] + choice_show = [] + headers = [] fields_to_show.each do |fs| col = 2 col = 3 if fs == "patent_title" @@ -45,12 +76,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